summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2001-12-07 16:07:04 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2001-12-07 16:07:04 (GMT)
commit2a42c3a8d3b9989aacc2d7bfcdcae4bdd97649e5 (patch)
tree1d10d53fa1695655e285d4eefda61df1f77c168c /Mac
parent542411384c8a6a31525dc74a46014d6af9c59efa (diff)
downloadcpython-2a42c3a8d3b9989aacc2d7bfcdcae4bdd97649e5.zip
cpython-2a42c3a8d3b9989aacc2d7bfcdcae4bdd97649e5.tar.gz
cpython-2a42c3a8d3b9989aacc2d7bfcdcae4bdd97649e5.tar.bz2
Not being able to copy PythonCore to the system-folder is not a fatal error, on OSX the user may not have permission to do so. Also give a more informative message in this case.
Fixes bug 475253.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/scripts/ConfigurePython.py12
-rw-r--r--Mac/scripts/ConfigurePython.rsrcbin9041 -> 9100 bytes
2 files changed, 8 insertions, 4 deletions
diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index 423b164..2b59d60 100644
--- a/Mac/scripts/ConfigurePython.py
+++ b/Mac/scripts/ConfigurePython.py
@@ -71,10 +71,13 @@ def mkcorealias(src, altsrc):
except os.error:
pass
do_copy = ask_copy()
- if do_copy:
- macostools.copy(os.path.join(sys.exec_prefix, src), dst)
- else:
- macostools.mkalias(os.path.join(sys.exec_prefix, src), dst)
+ try:
+ if do_copy:
+ macostools.copy(os.path.join(sys.exec_prefix, src), dst)
+ else:
+ macostools.mkalias(os.path.join(sys.exec_prefix, src), dst)
+ except IOError:
+ return 0
return 1
do_copy = None
@@ -166,6 +169,7 @@ def main():
Dlg.CautionAlert(ALERT_NOCORE, None)
if verbose:
print "Warning: PythonCore not copied to Extensions folder"
+ print " (Applets will not work unless run from the Python folder)"
if sys.argv[0][-7:] == 'Classic':
do_classic = 1
elif sys.argv[0][-6:] == 'Carbon':
diff --git a/Mac/scripts/ConfigurePython.rsrc b/Mac/scripts/ConfigurePython.rsrc
index e51fcf8..d3c69d8 100644
--- a/Mac/scripts/ConfigurePython.rsrc
+++ b/Mac/scripts/ConfigurePython.rsrc
Binary files differ