diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-09-17 18:40:15 +0000 |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2006-09-17 18:40:15 +0000 |
commit | 736fc567b26263b5f4714eb0d2ed5e1c2fed4b74 (patch) | |
tree | fc00707c463bed6fc8b88b9107a005bd02a537f3 /Mac/BuildScript/build-installer.py | |
parent | 137c789e8334b120226711a3f35afa7653d4168f (diff) | |
download | cpython-git-736fc567b26263b5f4714eb0d2ed5e1c2fed4b74.tar.gz |
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.
Diffstat (limited to 'Mac/BuildScript/build-installer.py')
-rwxr-xr-x | Mac/BuildScript/build-installer.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 083209b2c2..3176c7eb87 100755 --- 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') |