[Python-checkins] r51903 - in python/trunk/Mac: BuildScript/build-installer.py Tools/fixapplepython23.py

[ronald.oussoren]

Author: ronald.oussoren
Date: Sun Sep 17 20:42:53 2006
New Revision: 51903

Modified:
   python/trunk/Mac/BuildScript/build-installer.py
   python/trunk/Mac/Tools/fixapplepython23.py
Log:
Port of revision 51902 in release25-maint to the trunk


Modified: python/trunk/Mac/BuildScript/build-installer.py
==============================================================================
--- python/trunk/Mac/BuildScript/build-installer.py	(original)
+++ python/trunk/Mac/BuildScript/build-installer.py	Sun Sep 17 20:42:53 2006
@@ -945,6 +945,7 @@
     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')

Modified: python/trunk/Mac/Tools/fixapplepython23.py
==============================================================================
--- python/trunk/Mac/Tools/fixapplepython23.py	(original)
+++ python/trunk/Mac/Tools/fixapplepython23.py	Sun Sep 17 20:42:53 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()