FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-25 11:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Teach use_config to more gracefully fail during options() call #2043

Browse Source
This commit is contained in:
Alan Ray 2017-09-22 18:45:13 -04:00 committed by Thomas Nagy
parent f7833e73ff
commit 1e994e50fb
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
waflib/extras/use_config.py
View File

@ -149,6 +149,9 @@ def load_tool(tool, tooldir=None, ctx=None, with_sys_path=True):
try: try:
module = Context.load_tool_default(tool, tooldir, ctx, with_sys_path) module = Context.load_tool_default(tool, tooldir, ctx, with_sys_path)
except ImportError as e: except ImportError as e:
if not ctx or not hasattr(Options.options, 'download'):
Logs.error('Could not load %r during options phase (download unavailable at this point)' % tool)
raise
if Options.options.download: if Options.options.download:
module = download_tool(tool, ctx=ctx) module = download_tool(tool, ctx=ctx)
if not module: if not module: