FWGS
/
waf
mirror of https://gitlab.com/ita1024/waf.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into check_swig_version

This commit is contained in:
Daniel Bartel 2016-06-21 21:07:55 +02:00
parent 2241db8557 9be51b5cf8
commit 44b571172b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waflib/Scripting.py
View File

@ -593,7 +593,7 @@ def autoconfigure(execute_method):
Options.options.__dict__ = tmp
else:
run_command(cmd)
run_command(self.cmd)
run_command(self.cmd)
else:
return execute_method(self)
return execute

2
waflib/Tools/python.py
View File

@ -515,7 +515,7 @@ def check_python_version(conf, minver=None):
conf.msg('Checking for python version', pyver_full)
else:
minver_str = '.'.join(map(str, minver))
conf.msg('Checking for python version', pyver_full, ">= %s" % (minver_str,) and 'GREEN' or 'YELLOW')
conf.msg('Checking for python version >= %s' % (minver_str,), pyver_full, color=result and 'GREEN' or 'YELLOW')
if not result:
conf.fatal('The python version is too old, expecting %r' % (minver,))

2
waflib/Tools/waf_unit_test.py
View File

@ -76,7 +76,7 @@ def make_test(self):
if not hasattr(self, 'ut_env'):
self.ut_env = dct = dict(os.environ)
def add_path(var):
dct[var] = self.ut_paths + dct[var]
dct[var] = self.ut_paths + dct.get(var,'')
if Utils.is_win32:
add_path('PATH')
elif Utils.unversioned_sys_platform() == 'darwin':