From 2a42c3a8d3b9989aacc2d7bfcdcae4bdd97649e5 Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Fri, 7 Dec 2001 16:07:04 +0000
Subject: [PATCH] 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.
---
 Mac/scripts/ConfigurePython.py   |  12 ++++++++----
 Mac/scripts/ConfigurePython.rsrc | Bin 9041 -> 9100 bytes
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Mac/scripts/ConfigurePython.py b/Mac/scripts/ConfigurePython.py
index 423b164b4504..2b59d60bf5b5 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 e51fcf85ec41d586142330f042336ce775389f31..d3c69d8e9433323c48f203210020f935374dcf6d 100644
GIT binary patch
delta 828
zc-l>n!E4h{9LIl2v%<hxsA*c;#y(d(ZPu}iGC?;B6RNN}?ZsPN-e_r-7m^oiPn|GC
zWC!65PdmvNo(8(YJnkUkZF+Hc#s9#Af)Mjw=w99-@B8~D`TV}W@3-acyRYYp)fxay
z0#xnjMgR)GvH+Fr`$jLv0%P$oFm}`Id2ZqGuQ^hfhA!0LJp6(0%8vS2)mkm!XXion
z=gI9~^K+m<Oo5NrW^NuG&7ZO_mFvT$mTR>swh--L)FduN9`;G#tzjRn6Hm0;u4`lJ
zBT7W+;6C;#dWt>2OC0VK_F^(TQ)XdXaW!@2o~X~kB6Jk@<yM^pwuKx*QP=Tl+qRKE
z@G0KtUF~-*jMj)dKx7>?2ed<+I`J@yX3MJH_MSwerlyvB)aDKYo1WR)2z=q1gSt+<
zi1;&Fz_zf*efNpiV<-9hEMr{JWtIS`^23$YM-!jf3_2K^tK76Y5rzm#TSBL~F8mhT
zY=&VJVMg?U>)cnN6|QyhjjD2O#QhZ4`5!`SoMZk=@ZU)O#k9~v0X4D`np=?2d_h7B
z<uMfC(%u*fP#%q;0L6W2)Ywcg-zAtY63kcZ^m46e-h#6;nc~kd6t6$9%CylaHRXiD
zaU2Uok(id8rYEN9$B9^W6R{ky;q-DtA0>=^N*H^aFt#t3)u~+8tVt`S8!S`3^B+5r
B)Vlxx

delta 782
zc-rf6zvwo>KuYN|0|Nsm1B0?5kXB$|U<6X~*BKb(u5a|p7Ukz-_`z_Ev4km%i6u0Y
zfnjohxc6jT1=Y!qBpf$?6`jLYzY45_fgyrXgCU18hlR=C8_efnaA5FZEa>R;OU*3F
zNG(zbs4U6I&vVW%N>#|qN9H;w7A589DU_!IWs>s?GE-9&O7azedK8K)i%U{-71Hu^
zQc{cb6hbmGixqMcD;0866Z1d{fEu)cLWv3mMfpiNK$Yb{s}w5pOJT+<Wabr@B<AEK
zmSpDV>22<n`NSw4>?}KFm;F;C0|pibh<6#b&rW~3y{f!#@&P$>9kA;KIKULtZ;T)s
z5ikr4%re3LK_M)1lhYK|Nr{wz)G)FB|F6IxvkA;*1F<DbChIAR)r$pyg&6<;XJ8P8
zC}je%#UbL%Ahtvjn9TyxCVc_PxFbl$wSn0TAoXICkj&hLWabPcGv|QW{wyGlNE^&h
z1_s$jFhdy_q}33HiZdV#71KZ%D#3;@RFZ45kdj`#++hYd;A94o|Nn!fjbQ!&TIqnW
zQl<`Jr6gFKp@D%P7?wE*>qU{Q7j;1LlMIrd^uW<EdB2jQm#7Jnb6t>}tAylSH6-_Z
RLAXaQ1}O-3O!iWC0sstYx|;w1

-- 
2.47.3