From b0b16a622a6251432d57b155e1355855f7c77964 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Fri, 28 Feb 2020 20:15:10 -0600 Subject: [PATCH] Fix macOS version not selecting the right installer template folder for non-privte builds. --- indra/newview/viewer_manifest.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 5e35b01063..26ed2e5df6 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -248,6 +248,11 @@ class ViewerManifest(LLManifest,FSViewerManifest): def channel_type(self): # returns 'release', 'beta', 'project', or 'test' channel_qualifier=self.channel_variant().lower() + # Somehow, we started leaving the - separating the variant from the app name + # on the beginning of the channel qualifier. This screws up later processing that + # depends on the channel type. If it's there, we chop it off. + if channel_qualifier[0] == '-': + channel_qualifier = channel_qualifier[1:] if channel_qualifier.startswith('release'): channel_type='release' elif channel_qualifier.startswith('beta'):