From 3ed319a744287c9ef84e0a56a211782fecfedf64 Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Fri, 14 Apr 2017 13:04:51 +0200 Subject: [PATCH] Obtain NO_LOCK_IN_TOP/RUN/OUT from os.environ too --- waflib/Configure.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/waflib/Configure.py b/waflib/Configure.py index 4fcc54dc..c1525cda 100644 --- a/waflib/Configure.py +++ b/waflib/Configure.py @@ -181,11 +181,11 @@ class ConfigurationContext(Context.Context): env.files = self.files env.environ = dict(self.environ) - if not self.env.NO_LOCK_IN_RUN and not getattr(Options.options, 'no_lock_in_run'): + 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 and not getattr(Options.options, 'no_lock_in_top'): + if not (self.env.NO_LOCK_IN_TOP or env.environ.get('NO_LOCK_IN_TOP') or getattr(Options.options, 'no_lock_in_top')): env.store(os.path.join(Context.top_dir, Options.lockfile)) - if not self.env.NO_LOCK_IN_OUT and not getattr(Options.options, 'no_lock_in_out'): + if not (self.env.NO_LOCK_IN_OUT or env.environ.get('NO_LOCK_IN_OUT') or getattr(Options.options, 'no_lock_in_out')): env.store(os.path.join(Context.out_dir, Options.lockfile)) def prepare_env(self, env):