aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorDavid Seikel2011-03-27 01:34:29 +1000
committerDavid Seikel2011-03-27 01:34:29 +1000
commit142bb12865df1d98322a3c168d2881651f76423f (patch)
tree5b60ca3ac7f385b09a923a9a383f2d6351eb6c8f /linden/indra/newview
parentTurn on the linux tarball generation again. Add a comment that we need a way... (diff)
downloadmeta-impy-142bb12865df1d98322a3c168d2881651f76423f.zip
meta-impy-142bb12865df1d98322a3c168d2881651f76423f.tar.gz
meta-impy-142bb12865df1d98322a3c168d2881651f76423f.tar.bz2
meta-impy-142bb12865df1d98322a3c168d2881651f76423f.tar.xz
Test BEFORE you commit. Doh! I blame python and it's stupid "white space is a significant language token" policy.
Diffstat (limited to 'linden/indra/newview')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py38
1 files changed, 19 insertions, 19 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 7eb2c7f..3a7039b 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -975,26 +975,26 @@ class LinuxManifest(ViewerManifest):
975 # Disabled for now. It's a waste of time to package every compile. 975 # Disabled for now. It's a waste of time to package every compile.
976 # Hmm, need a way to turn this on and off. 976 # Hmm, need a way to turn this on and off.
977 977
978 if("package" in self.args['actions'] or 978 if("package" in self.args['actions'] or
979 "unpacked" in self.args['actions']): 979 "unpacked" in self.args['actions']):
980 980
981 # temporarily move directory tree so that it has the right 981 # temporarily move directory tree so that it has the right
982 # name in the tarfile 982 # name in the tarfile
983 self.run_command("mv %(dst)s %(inst)s" % { 983 self.run_command("mv %(dst)s %(inst)s" % {
984 'dst': self.get_dst_prefix(), 984 'dst': self.get_dst_prefix(),
985 'inst': self.build_path_of(installer_name)}) 985 'inst': self.build_path_of(installer_name)})
986 try: 986 try:
987 # --numeric-owner hides the username of the builder for 987 # --numeric-owner hides the username of the builder for
988 # security etc. 988 # security etc.
989 self.run_command('tar -C %(dir)s --numeric-owner -cjf ' 989 self.run_command('tar -C %(dir)s --numeric-owner -cjf '
990 '%(inst_path)s.tar.bz2 %(inst_name)s' % { 990 '%(inst_path)s.tar.bz2 %(inst_name)s' % {
991 'dir': self.get_build_prefix(), 991 'dir': self.get_build_prefix(),
992 'inst_name': installer_name, 992 'inst_name': installer_name,
993 'inst_path':self.build_path_of(installer_name)}) 993 'inst_path':self.build_path_of(installer_name)})
994 finally: 994 finally:
995 self.run_command("mv %(inst)s %(dst)s" % { 995 self.run_command("mv %(inst)s %(dst)s" % {
996 'dst': self.get_dst_prefix(), 996 'dst': self.get_dst_prefix(),
997 'inst': self.build_path_of(installer_name)}) 997 'inst': self.build_path_of(installer_name)})
998 998
999class Linux_i686Manifest(LinuxManifest): 999class Linux_i686Manifest(LinuxManifest):
1000 def construct(self): 1000 def construct(self):