From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 7 Dec 2001 16:07:04 +0000 (+0000)
Subject: Not being able to copy PythonCore to the system-folder is not a fatal error, on OSX... 
X-Git-Tag: v2.2.1c1~486
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a42c3a8d3b9989aacc2d7bfcdcae4bdd97649e5;p=python

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.
---

diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index 423b164b45..2b59d60bf5 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 e51fcf85ec..d3c69d8e94 100644
Binary files a/Mac/scripts/ConfigurePython.rsrc and b/Mac/scripts/ConfigurePython.rsrc differ