From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sat, 24 Jan 2009 01:49:11 +0000 (-0700)
Subject: setup: sys.exit() raises a SystemExit exception on Python 2.4 on Solaris -- fix it... 
X-Git-Tag: allmydata-tahoe-1.3.0~146
X-Git-Url: https://git.rkrishnan.org/%5B/rgr-080307.php?a=commitdiff_plain;h=89a4b5f4f50e8ce99356602b764852bec70b3931;p=tahoe-lafs%2Ftahoe-lafs.git

setup: sys.exit() raises a SystemExit exception on Python 2.4 on Solaris -- fix it so that bin/tahoe doesn't interpret this as its brother having been non-executable
---

diff --git a/bin/tahoe b/bin/tahoe
index 963abff0..71dbc809 100644
--- a/bin/tahoe
+++ b/bin/tahoe
@@ -49,7 +49,6 @@ executable = os.path.join(base, "support", bin_dir, "tahoe")
 
 try:
     res = subprocess.call([executable] + sys.argv[1:], env=os.environ)
-    sys.exit(res)
 except (OSError, IOError), le:
     if le.args[0] == errno.ENOENT:
         print whoami
@@ -67,3 +66,5 @@ I just tried to invoke my brother, named "../support/bin/tahoe" and got an
 exception.
 '''
     raise
+else:
+    sys.exit(res)