Workaround for bug #1558983

There is an issue with custom icons on directories in the 2.5c2 installer,
don't set a custom icon on "/Applications/MacPython 2.5" for now.

Also make sure that the installer doesn't crap out when the Makefile in the
system's python installation has other customizations than we expect.

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 083209b2c2cbba33be94340545eacfca03466137..3176c7eb87a8989824fea845b5303ff12081ea0c 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -945,6 +945,10 @@ def setIcon(filePath, icnsPath):
     ref, isDirectory = Carbon.File.FSPathMakeRef(filePath)
 
     if isDirectory:
+        # There is a problem with getting this into the pax(1) archive,
+        # just ignore directory icons for now.
+        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 fb8645a629b74de93cc10fe9c0e30985e3321b59..6ba54019f0773e5f29bd1bc329aabf96a1e439eb 100644 (file)
--- 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()