mirror of
				https://github.com/python/cpython.git
				synced 2025-10-30 21:21:22 +00:00 
			
		
		
		
	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.
This commit is contained in:
		
							parent
							
								
									542411384c
								
							
						
					
					
						commit
						2a42c3a8d3
					
				
					 2 changed files with 8 additions and 4 deletions
				
			
		|  | @ -71,10 +71,13 @@ def mkcorealias(src, altsrc): | ||||||
| 	except os.error: | 	except os.error: | ||||||
| 		pass | 		pass | ||||||
| 	do_copy = ask_copy() | 	do_copy = ask_copy() | ||||||
| 	if do_copy: | 	try: | ||||||
| 		macostools.copy(os.path.join(sys.exec_prefix, src), dst) | 		if do_copy: | ||||||
| 	else: | 			macostools.copy(os.path.join(sys.exec_prefix, src), dst) | ||||||
| 		macostools.mkalias(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 | 	return 1 | ||||||
| 	 | 	 | ||||||
| do_copy = None | do_copy = None | ||||||
|  | @ -166,6 +169,7 @@ def main(): | ||||||
| 		Dlg.CautionAlert(ALERT_NOCORE, None) | 		Dlg.CautionAlert(ALERT_NOCORE, None) | ||||||
| 		if verbose: | 		if verbose: | ||||||
| 			print "Warning: PythonCore not copied to Extensions folder" | 			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': | 	if sys.argv[0][-7:] == 'Classic': | ||||||
| 		do_classic = 1 | 		do_classic = 1 | ||||||
| 	elif sys.argv[0][-6:] == 'Carbon': | 	elif sys.argv[0][-6:] == 'Carbon': | ||||||
|  |  | ||||||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Jack Jansen
						Jack Jansen