aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 27c12dd..ae25745 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -483,11 +483,14 @@ class LinuxManifest(ViewerManifest):
483 find %(dst)s -type f -perm 0400 | xargs chmod 0444; 483 find %(dst)s -type f -perm 0400 | xargs chmod 0444;
484 true""" % {'dst':self.get_dst_prefix() }) 484 true""" % {'dst':self.get_dst_prefix() })
485 485
486 # temporarily move directory tree so that it has the right name in the tarfile 486 if("package" in self.args['actions'] or
487 self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)}) 487 "unpacked" in self.args['actions']):
488 # --numeric-owner hides the username of the builder for security etc. 488 # temporarily move directory tree so that it has the right name in the tarfile
489 self.run_command('tar -C %(dir)s --numeric-owner -cjf %(inst_path)s.tar.bz2 %(inst_name)s' % {'dir':self.get_src_prefix(), 'inst_name': installer_name, 'inst_path':self.src_path_of(installer_name)}) 489 self.run_command("mv %(dst)s %(inst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
490 self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)}) 490 # --numeric-owner hides the username of the builder for security etc.
491 self.run_command('tar -C %(dir)s --numeric-owner -cjf %(inst_path)s.tar.bz2 %(inst_name)s' % {'dir':self.get_src_prefix(), 'inst_name': installer_name, 'inst_path':self.src_path_of(installer_name)})
492 self.run_command("mv %(inst)s %(dst)s" % {'dst':self.get_dst_prefix(),'inst':self.src_path_of(installer_name)})
493
491 494
492class Linux_i686Manifest(LinuxManifest): 495class Linux_i686Manifest(LinuxManifest):
493 def construct(self): 496 def construct(self):