From 9261d069ef96c96f69d07b14c36a2d4182d6543c Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 13 Jun 2013 15:40:59 -0400
Subject: [PATCH] MAINT-2787: Expand viewer_manifest.py's "Release" recognition
viewer_manifest.py currently detects specifically the channel name "Second
Life Release" as a release viewer (affecting the icon and other things). The
Amazon viewer uses channel name "Second Life Release - Amazon", which is
currently not recognized at all, therefore uses a developer-build icon with
the caution tape and the word "TEST" stamped onto it. Detect any channel name
*starting* with "Second Life Release" as a release viewer.
---
indra/newview/viewer_manifest.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 35451c96211..53a3e732caa 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -172,7 +172,7 @@ def channel_lowerword(self):
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()
@@ -182,8 +182,8 @@ def icon_path(self):
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) :
@@ -242,7 +242,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())
--
GitLab