From 76ba60db0b01316022c9af7ef996f84d5141485d Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Mon, 29 Nov 2010 15:19:52 -0800
Subject: [PATCH] Better fix for CHOP-223. Comments on the mercurial bug
tracker indicate that this bug is likely to recur, so we work around it in
viewer_manifest.py now. http://mercurial.selenic.com/bts/issue1802
---
indra/newview/viewer_manifest.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1bc118139fb..9a99c17f308 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -711,6 +711,11 @@ def construct(self):
self.run_command('strip -S %(viewer_binary)r' %
{ 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
+ def copy_finish(self):
+ # Force executable permissions to be set for scripts
+ # see CHOP-223 and http://mercurial.selenic.com/bts/issue1802
+ for script in 'MacOS/update_install':
+ self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script))
def package_finish(self):
channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own
@@ -866,6 +871,12 @@ def construct(self):
self.path("featuretable_linux.txt")
+ def copy_finish(self):
+ # Force executable permissions to be set for scripts
+ # see CHOP-223 and http://mercurial.selenic.com/bts/issue1802
+ for script in 'secondlife', 'bin/update_install':
+ self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script))
+
def package_finish(self):
if 'installer_name' in self.args:
installer_name = self.args['installer_name']
--
GitLab