diff options
Diffstat (limited to 'waflib/Configure.py')
| -rw-r--r-- | waflib/Configure.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/waflib/Configure.py b/waflib/Configure.py index 1af9a67..a5da91b 100644 --- a/waflib/Configure.py +++ b/waflib/Configure.py @@ -61,7 +61,7 @@ class ConfigurationContext(Context.Context): self.bldnode=(os.path.isabs(out)and self.root or self.path).make_node(out) self.bldnode.mkdir() if not os.path.isdir(self.bldnode.abspath()): - conf.fatal('Could not create the build directory %s'%self.bldnode.abspath()) + self.fatal('Could not create the build directory %s'%self.bldnode.abspath()) def execute(self): self.init_dirs() self.cachedir=self.bldnode.make_node(Build.CACHE_DIR) @@ -96,6 +96,7 @@ class ConfigurationContext(Context.Context): env.hash=self.hash env.files=self.files env.environ=dict(self.environ) + env.launch_dir=Context.launch_dir if not(self.env.NO_LOCK_IN_RUN or env.environ.get('NO_LOCK_IN_RUN')or getattr(Options.options,'no_lock_in_run')): env.store(os.path.join(Context.run_dir,Options.lockfile)) if not(self.env.NO_LOCK_IN_TOP or env.environ.get('NO_LOCK_IN_TOP')or getattr(Options.options,'no_lock_in_top')): @@ -140,9 +141,9 @@ class ConfigurationContext(Context.Context): module=None try: module=Context.load_tool(tool,tooldir,ctx=self,with_sys_path=with_sys_path) - except ImportError ,e: + except ImportError as e: self.fatal('Could not load the Waf tool %r from %r\n%s'%(tool,getattr(e,'waf_sys_path',sys.path),e)) - except Exception ,e: + except Exception as e: self.to_log('imp %r (%r & %r)'%(tool,tooldir,funs)) self.to_log(traceback.format_exc()) raise |