comparison wscript @ 22:a2b1966ebe5a

Fixed bug in wscript that caused FIFEPATH to be set to the wrong default. * FIFEPATH was incorrectly being set to the current working directory when no argument was specified, the default should have been Python's site-packages directory. * FIFEPATH should now correctly default to Python's site-packages when no --fifepath argument is specified.
author M. George Hansen <technopolitica@gmail.com>
date Wed, 15 Jun 2011 21:44:19 -1000
parents feceb6130570
children
comparison
equal deleted inserted replaced
21:feceb6130570 22:a2b1966ebe5a
26 min_python_version = (2, 7) 26 min_python_version = (2, 7)
27 else: 27 else:
28 min_python_version = (2, 6) 28 min_python_version = (2, 6)
29 cnf.check_python_version(min_python_version) 29 cnf.check_python_version(min_python_version)
30 30
31 if not cnf.options.fifepath: 31 if cnf.options.fifepath:
32 cnf.env['FIFEPATH'] = os.path.abspath( 32 cnf.env['FIFEPATH'] = os.path.abspath(
33 os.path.expanduser(cnf.options.fifepath) 33 os.path.expanduser(cnf.options.fifepath)
34 ) 34 )
35 else: 35 else:
36 cnf.env['FIFEPATH'] = cnf.env['PYTHONDIR'] 36 cnf.env['FIFEPATH'] = cnf.env['PYTHONDIR']