[Python-checkins] CVS: python/dist/src/Mac/scripts ConfigurePython.py,1.40,1.41

Jack Jansen jackjansen@users.sourceforge.net
Fri, 07 Dec 2001 08:07:02 -0800


Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv26405/Python/Mac/scripts

Modified Files:
	ConfigurePython.py 
Log Message:
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.

Index: ConfigurePython.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/ConfigurePython.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ConfigurePython.py	2001/08/25 12:02:19	1.40
--- ConfigurePython.py	2001/12/07 16:06:59	1.41
***************
*** 72,79 ****
  		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
  	
--- 72,82 ----
  		pass
  	do_copy = ask_copy()
! 	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
  	
***************
*** 167,170 ****
--- 170,174 ----
  		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