summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2017-04-17 13:09:19 -0700
committerGlenn Glazer <coyot@lindenlab.com>2017-04-17 13:09:19 -0700
commit869771f7c9b6ef30d01120b68b3759aeac74fea5 (patch)
tree37629c1fc0993c07153018c37b8b67b3c609e4a8 /indra
parent778a35d9bcfc254490dcbc118701b5081b22f848 (diff)
SL-617: alter viewer manifest to write exe name to summary.json, upgrade VMP package to 504292 to read it
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/viewer_manifest.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f6bbe7365a..bac80d8c13 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -206,6 +206,9 @@ class ViewerManifest(LLManifest):
summary_dict = {"Type":"viewer","Version":'.'.join(self.args['version']),
"Channel":self.channel_with_pkg_suffix(),
"Platform":summary_json_platform}
+ #MAINT-7294: Windows exe names depend on channel name, so write that in also
+ if summary_json_platform.startswith('win'):
+ summary_dict.update({'Executable':self.channel_with_pkg_suffix().replace(' ', '')+'.exe'})
with open(os.path.join(os.pardir,'summary.json'), 'w') as summary_handle:
json.dump(summary_dict,summary_handle)