diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-09-17 18:42:53 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-09-17 18:42:53 +0000 |
| commit | 1476b5582a5679f3e8cb4049ce64c2a8ebbf6d67 (patch) | |
| tree | bc203311a4e503073927fae00c503b5637280f51 /Mac | |
| parent | c70a35415311b609c2508c38f92d44b411aeeaed (diff) | |
| download | cpython-1476b5582a5679f3e8cb4049ce64c2a8ebbf6d67.tar.gz | |
Port of revision 51902 in release25-maint to the trunk
Diffstat (limited to 'Mac')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 1 | ||||
| -rw-r--r-- | Mac/Tools/fixapplepython23.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 083209b2c2..a581814c8d 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 fb8645a629..6ba54019f0 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() |