From 65e4ea3e28446585e8a36db9b06edb457b3de7f4 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 28 Feb 2013 13:45:49 -0500
Subject: [PATCH] correct icon and app name recognition by channel
---
indra/newview/viewer_manifest.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 63db76ff90c..b3c0e650ece 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -176,18 +176,19 @@ def app_name(self):
channel_type=self.channel_lowerword()
if channel_type == 'release' :
app_suffix='Viewer'
- elif re.match('(beta|project) .*',channel_type) :
+ elif re.match('^(beta|project).*',channel_type) :
app_suffix=self.channel_unique()
return "Second Life "+app_suffix
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
- elif re.match('beta .*',channel_type) :
+ elif re.match('^beta.*',channel_type) :
icon_path += 'beta'
- elif re.match('project .*',channel_type) :
+ elif re.match('^project.*',channel_type) :
icon_path += 'project'
else :
icon_path += 'test'
@@ -245,7 +246,7 @@ def final_exe(self):
channel_type=self.channel_lowerword()
if channel_type == 'release' :
app_suffix=''
- elif re.match('(beta|project) .*',channel_type) :
+ elif re.match('^(beta|project).*',channel_type) :
app_suffix=''.join(self.channel_unique().split())
return "SecondLife"+app_suffix+".exe"
--
GitLab