Waf lockfile path

[Andrew Bartlett]

On Wed, 2012-05-16 at 11:15 +1000, Amitay Isaacs wrote:
> Hi,
> 
> I noticed that LOAD_ENVIRONMENT() function in wafsamba/samba_utils.py
> uses hard coded lock file '.lock-wscript' (which is the default value
> for WAFLOCK) rather than using Options.lockfile which is set correctly
> to the lock file based on WAFLOCK environment variable.
> 
> Following patch makes sure that we load the options from the correct
> lock file. Is this correct, or are there hidden assumptions?
> 
> --- a/buildtools/wafsamba/samba_utils.py
> +++ b/buildtools/wafsamba/samba_utils.py
> @@ -420,7 +420,7 @@ def LOAD_ENVIRONMENT():
>      import Environment
>      env = Environment.Environment()
>      try:
> -        env.load('.lock-wscript')
> +        env.load(Options.lockfile)
>          env.load(env.blddir + '/c4che/default.cache.py')
>      except:
>          pass

Yes, it looks like the reconfigure target uses it.

Andrew Bartlett
-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org