From be0323bac6246697ccf668a66cee414feac5fd7d Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Mon, 6 Jun 2011 01:15:39 +1000
Subject: Comment out the packaging stuff again, upstream made something
 better.  I think.  lol

---
 linden/indra/newview/viewer_manifest.py | 43 +++++++++++++++++----------------
 1 file changed, 22 insertions(+), 21 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 6f85311..4e29021 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -989,27 +989,28 @@ class LinuxManifest(ViewerManifest):
 
         # Disabled for now. It's a waste of time to package every compile.
         # Hmm, need a way to turn this on and off.
-
-        if("package" in self.args['actions'] or
-	    "unpacked" in self.args['actions']):
-        
-            # temporarily move directory tree so that it has the right
-            # name in the tarfile
-            self.run_command("mv %(dst)s %(inst)s" % {
-                'dst': self.get_dst_prefix(),
-                'inst': self.build_path_of(installer_name)})
-            try:
-                # --numeric-owner hides the username of the builder for
-                # security etc.
-                self.run_command('tar -C %(dir)s --numeric-owner -cjf '
-                                 '%(inst_path)s.tar.bz2 %(inst_name)s' % {
-                    'dir': self.get_build_prefix(),
-                    'inst_name': installer_name,
-                    'inst_path':self.build_path_of(installer_name)})
-            finally:
-                self.run_command("mv %(inst)s %(dst)s" % {
-                    'dst': self.get_dst_prefix(),
-                    'inst': self.build_path_of(installer_name)})
+        # Looks like upstream found a way, delete this crap after testing.
+
+        # if("package" in self.args['actions'] or
+	#     "unpacked" in self.args['actions']):
+        # 
+        #     # temporarily move directory tree so that it has the right
+        #     # name in the tarfile
+        #     self.run_command("mv %(dst)s %(inst)s" % {
+        #         'dst': self.get_dst_prefix(),
+        #         'inst': self.build_path_of(installer_name)})
+        #     try:
+        #         # --numeric-owner hides the username of the builder for
+        #         # security etc.
+        #         self.run_command('tar -C %(dir)s --numeric-owner -cjf '
+        #                          '%(inst_path)s.tar.bz2 %(inst_name)s' % {
+        #             'dir': self.get_build_prefix(),
+        #             'inst_name': installer_name,
+        #             'inst_path':self.build_path_of(installer_name)})
+        #     finally:
+        #         self.run_command("mv %(inst)s %(dst)s" % {
+        #             'dst': self.get_dst_prefix(),
+        #             'inst': self.build_path_of(installer_name)})
 
 class Linux_i686Manifest(LinuxManifest):
     def construct(self):
-- 
cgit v1.1