diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 08:59:37 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 08:59:37 -0400 |
| commit | f7cdbb2582d6328e62220dc4955c89bafcad5565 (patch) | |
| tree | 7542e74d37b066afdffcb0ba8e8cd01ff1d0a321 /indra/newview/viewer_manifest.py | |
| parent | c109361861a9f96566ae4acbc2b42e6afd5180bf (diff) | |
| parent | 39bd14f3ca26c04072dcee68c5757232412f4014 (diff) | |
CHOP-962: merge code-review fixes with viewer-release
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 1429fe4c7a..206f81cdc2 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -193,7 +193,7 @@ class ViewerManifest(LLManifest): def app_name(self): app_suffix='Test' channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='Viewer' elif re.match('^(beta|project).*',channel_type) : app_suffix=self.channel_unique() @@ -203,8 +203,8 @@ class ViewerManifest(LLManifest): icon_path="icons/" channel_type=self.channel_lowerword() print "Icon channel type '%s'" % channel_type - if channel_type == 'release' : - icon_path += channel_type + if channel_type.startswith('release') : + icon_path += 'release' elif re.match('^beta.*',channel_type) : icon_path += 'beta' elif re.match('^project.*',channel_type) : @@ -265,7 +265,7 @@ class WindowsManifest(ViewerManifest): def final_exe(self): app_suffix="Test" channel_type=self.channel_lowerword() - if channel_type == 'release' : + if channel_type.startswith('release') : app_suffix='' elif re.match('^(beta|project).*',channel_type) : app_suffix=''.join(self.channel_unique().split()) |