[Python-checkins] r51902 - in python/branches/release25-maint/Mac: BuildScript/build-installer.py Tools/fixapplepython23.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Sep 17 20:40:15 2006
New Revision: 51902

Modified:
   python/branches/release25-maint/Mac/BuildScript/build-installer.py
   python/branches/release25-maint/Mac/Tools/fixapplepython23.py
Log:
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.


Modified: python/branches/release25-maint/Mac/BuildScript/build-installer.py
==============================================================================
--- python/branches/release25-maint/Mac/BuildScript/build-installer.py	(original)
+++ python/branches/release25-maint/Mac/BuildScript/build-installer.py	Sun Sep 17 20:40:15 2006
@@ -945,6 +945,10 @@
     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')

Modified: python/branches/release25-maint/Mac/Tools/fixapplepython23.py
==============================================================================
--- python/branches/release25-maint/Mac/Tools/fixapplepython23.py	(original)
+++ python/branches/release25-maint/Mac/Tools/fixapplepython23.py	Sun Sep 17 20:40:15 2006
@@ -123,7 +123,8 @@
             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()