From 1f4ffb0d7a6f94ff8daa9021fccbd5062010ac85 Mon Sep 17 00:00:00 2001 From: Ryan Williams Date: Tue, 24 Jul 2007 06:09:13 +0000 Subject: Minor bugfixes for a line in viewer_manifest that never gets run (because of the way the SConstruct file on Linux is built). However, it might get run in the future, so there we go. Thanks cg for finding this. Not reviewed. --- indra/newview/viewer_manifest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 4acef46474..0fe81baae9 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -370,8 +370,8 @@ class LinuxManifest(ViewerManifest): if(self.args.has_key('installer_name')): installer_name = self.args['installer_name'] else: - installer_name = '_'.join('SecondLife_', self.args.get('arch'), *self.args['version']) - if grid != '': + installer_name = '_'.join(['SecondLife', self.args.get('arch'), '_'.join(self.args['version'])]) + if not self.default_grid(): installer_name += "_" + grid.upper() # temporarily move directory tree so that it has the right name in the tarfile -- cgit v1.2.3