[PATCH] build: Fixed usage of non-default path to WAFLOCK

[Karaliou, Aliaksei]

Hello Alexander,


Thanks for review, I've created merge request - https://gitlab.com/samba-team/samba/merge_requests/249


Best regards,

    Aliaksei

________________________________
From: Alexander Bokovoy <ab at samba.org>
Sent: Thursday, February 7, 2019 12:52:20 PM
To: Karaliou, Aliaksei
Cc: samba-technical at lists.samba.org
Subject: Re: [PATCH] build: Fixed usage of non-default path to WAFLOCK

On ke, 06 helmi 2019, Karaliou, Aliaksei via samba-technical wrote:
> Hi,
>
> Please, review and accept this small patch that fixes the possibility to specify non-default waf lock file.
> Of course, with new waf it is not possible to specify a full path, only different name, but maybe this is going to be fixed since the fix for common case is simple.
>
> Best regards,
>   Aliaksei

> From 0d155e9eb889d0ee8b6d9624d45193291289173d Mon Sep 17 00:00:00 2001
> From: Aliaksei Karaliou <akaraliou at panasas.com>
> Date: Thu, 27 Dec 2018 04:51:41 -0500
> Subject: [PATCH] build: Fixed usage of non-default path to WAFLOCK
>
> 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 at panasas.com>
> ---
>  buildtools/wafsamba/samba_utils.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
> index 2a7f62f..65ccfde 100644
> --- a/buildtools/wafsamba/samba_utils.py
> +++ b/buildtools/wafsamba/samba_utils.py
> @@ -558,7 +558,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()
Looks good to me. Could you please open a gitlab pull request to see if
it breaks or not the whole build?

We also need another reviewer.

--
/ Alexander Bokovoy