build: Fixed usage of non-default path to WAFLOCK
authorAliaksei Karaliou <akaraliou@panasas.com>
Thu, 27 Dec 2018 09:51:41 +0000 (04:51 -0500)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 11 Feb 2019 06:43:31 +0000 (07:43 +0100)
If WAFLOCK environment variable is set, use it to override path
to WAF lock file in Samba build scripts.

Signed-off-by: Aliaksei Karaliou <akaraliou@panasas.com>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
buildtools/wafsamba/samba_utils.py

index bc36d1f194d979825feb052a335ad4f3da6163e9..93ce317f114504ddced550e8ad99884f01e17e8a 100644 (file)
@@ -590,7 +590,7 @@ def load_file(filename):
 
 def reconfigure(ctx):
     '''rerun configure if necessary'''
-    if not os.path.exists(".lock-wscript"):
+    if not os.path.exists(os.environ.get('WAFLOCK', '.lock-wscript')):
         raise Errors.WafError('configure has not been run')
     import samba_wildcard
     bld = samba_wildcard.fake_build_environment()