From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Sun, 17 Sep 2006 18:42:53 +0000 (+0000)
Subject: Port of revision 51902 in release25-maint to the trunk
X-Git-Tag: v2.6a1~2656
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3564c4622fb5c3bb654bafd8b0169a7244c3f39c;p=thirdparty%2FPython%2Fcpython.git

Port of revision 51902 in release25-maint to the trunk
---

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 083209b2c2cb..a581814c8d4e 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -945,6 +945,7 @@ def setIcon(filePath, icnsPath):
     ref, isDirectory = Carbon.File.FSPathMakeRef(filePath)
 
     if isDirectory:
+        return
         tmpPath = os.path.join(filePath, "Icon\r")
         if not os.path.exists(tmpPath):
             fp = open(tmpPath, 'w')
diff --git a/Mac/Tools/fixapplepython23.py b/Mac/Tools/fixapplepython23.py
index fb8645a629b7..6ba54019f077 100644
--- a/Mac/Tools/fixapplepython23.py
+++ b/Mac/Tools/fixapplepython23.py
@@ -123,7 +123,8 @@ def main():
             makescript(GXX_SCRIPT, "g++")
     #  Finally fix the makefile
     rv = fix(MAKEFILE, do_apply)
-    sys.exit(rv)
+    #sys.exit(rv)
+    sys.exit(0)
 
 if __name__ == '__main__':
     main()