Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixed _sys_home computation and added diagnostics for Windows buildbot failures.

This commit is contained in:
Vinay Sajip 2012-05-27 17:30:09 +01:00
parent 0b43bcf528
commit 7e203498d1
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/distutils/sysconfig.py
View File

@ -50,6 +50,8 @@ _sys_home = getattr(sys, '_home', None)
if _sys_home and os.name == 'nt' and \
_sys_home.lower().endswith(('pcbuild', 'pcbuild\\amd64')):
_sys_home = os.path.dirname(_sys_home)
if _sys_home.endswith('pcbuild'): # must be amd64
_sys_home = os.path.dirname(_sys_home)
def _python_build():
if _sys_home:
return _is_python_source_dir(_sys_home)

3
Lib/sysconfig.py
View File

@ -107,7 +107,8 @@ _sys_home = getattr(sys, '_home', None)
if _sys_home and os.name == 'nt' and \
_sys_home.lower().endswith(('pcbuild', 'pcbuild\\amd64')):
_sys_home = os.path.dirname(_sys_home)
if _sys_home.endswith('pcbuild'): # must be amd64
_sys_home = os.path.dirname(_sys_home)
def is_python_build(check_home=False):
if check_home and _sys_home:
return _is_python_source_dir(_sys_home)

5
Lib/test/test_venv.py
View File

@ -76,7 +76,10 @@ class BasicTest(BaseTest):
data = self.get_text_file_contents(self.bindir, self.ps3name)
self.assertTrue(data.startswith('#!%s%s' % (self.env_dir, os.sep)))
fn = self.get_env_file(self.bindir, self.exe)
self.assertTrue(os.path.exists(fn), 'File %r exists' % fn)
if not os.path.exists(fn): # diagnostics for Windows buildbot failures
print('Contents of %r:' % self.bindir)
print(' %r' % os.listdir(self.bindir))
self.assertTrue(os.path.exists(fn), 'File %r should exist.' % fn)
def test_overwrite_existing(self):
"""