From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 13 Oct 2000 23:33:34 +0000 (+0000)
Subject: If we're installing to another partition than the system partition offer to copy... 
X-Git-Tag: v2.0~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52b5b0221f7207a1dbd4b9b23885f6e89b8f109e;p=thirdparty%2FPython%2Fcpython.git

If we're installing to another partition than the system partition offer to copy PythonCore in stead of aliasing it. This should fix the applet problems some people have.
---

diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index 88d66a416f65..91e0af03d3ce 100644
--- a/Mac/scripts/ConfigurePython.py
+++ b/Mac/scripts/ConfigurePython.py
@@ -18,6 +18,9 @@ SPLASH_REMOVE=513
 SPLASH_CFM68K=514
 SPLASH_PPC=515
 SPLASH_NUMPY=516
+ALERT_NONBOOT=517
+ALERT_NONBOOT_COPY=1
+ALERT_NONBOOT_ALIAS=2
 
 ppc_goals = [
 ## 	("AE.ppc.slb", "toolboxmodules.ppc.slb"),
@@ -134,7 +137,19 @@ def mkcorealias(src, altsrc):
 		os.unlink(dst)
 	except os.error:
 		pass
-	macostools.mkalias(os.path.join(sys.exec_prefix, src), dst)
+	do_copy = 0
+	if macfs.FSSpec(sys.exec_prefix).as_tuple()[0] != -1: # XXXX
+		try:
+			import Dlg
+			rv = Dlg.CautionAlert(ALERT_NONBOOT, None)
+			if rv == ALERT_NONBOOT_COPY:
+				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)
 	if verbose:  print ' ', dst, '->', src
 	return 1
 	
diff --git a/Mac/scripts/ConfigurePython.rsrc b/Mac/scripts/ConfigurePython.rsrc
index d55f604474df..2f23602ba150 100644
Binary files a/Mac/scripts/ConfigurePython.rsrc and b/Mac/scripts/ConfigurePython.rsrc differ