commit 3564c4622fb5c3bb654bafd8b0169a7244c3f39c
author Ronald Oussoren <ronaldoussoren@mac.com> Sun Sep 17 18:42:53 2006 +0000
committer Ronald Oussoren <ronaldoussoren@mac.com> Sun Sep 17 18:42:53 2006 +0000
tree 2a6e3b7e7cbc4df9b9668a9c15d593a8c9b05166
parent 43fd99c8f83868285422e277c7b4d7265102d41a

Port of revision 51902 in release25-maint to the trunk

Mac/BuildScript/build-installer.py

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 083209b..a581814 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -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')

Mac/Tools/fixapplepython23.py

diff --git a/Mac/Tools/fixapplepython23.py b/Mac/Tools/fixapplepython23.py
index fb8645a..6ba5401 100644
--- a/Mac/Tools/fixapplepython23.py
+++ b/Mac/Tools/fixapplepython23.py
@@ -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()