From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 29 Mar 2001 13:53:19 +0000 (+0000)
Subject: On OSX always copy PythonCore. It turns out an orphaned alias in /Library/CFMSupport... 
X-Git-Tag: v2.1c1~212
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e2546c5fd8c2d13a323637065fc0f7e4d76604d;p=thirdparty%2FPython%2Fcpython.git

On OSX always copy PythonCore. It turns out an orphaned alias in /Library/CFMSupport (happens when you remove python and aliased pythoncore) wreaks havoc with the system.
---

diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index d5d6687e28f2..c1bfb2b5a16d 100644
--- a/Mac/scripts/ConfigurePython.py
+++ b/Mac/scripts/ConfigurePython.py
@@ -70,6 +70,22 @@ def mkcorealias(src, altsrc):
 		os.unlink(dst)
 	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)
+	return 1
+	
+do_copy = None
+def ask_copy():
+	global do_copy
+	if do_copy != None:
+		return do_copy
+	# On OSX always copy
+	if gestalt.gestalt('sysv') > 0x9ff:
+		do_copy = 1
+		return do_copy
 	do_copy = 0
 	if macfs.FSSpec(sys.exec_prefix).as_tuple()[0] != -1: # XXXX
 		try:
@@ -79,11 +95,8 @@ def mkcorealias(src, altsrc):
 				do_copy = 1
 		except ImportError:
 			pass
-	if do_copy:
-		macostools.copy(os.path.join(sys.exec_prefix, src), dst)
-	else:
-		macostools.mkalias(os.path.join(sys.exec_prefix, src), dst)
-	return 1
+	return do_copy
+	
 
 # Copied from fullbuild, should probably go to buildtools
 def buildapplet(top, dummy, list):