[Fwd: [Fwd: Re: [PATCH] waf: Utils package not defined]]

[swen]

Hi Metze

See'ing that you're busy in the heimdal kerberos area
I was wondering if you could have a look at the below :-)

Thanks in advance !

Cheers Swen
-------- Forwarded Message --------
From: swen <swen at linux.ibm.com>
Reply-To: swen at linux.ibm.com
To: samba-technical <samba-technical at lists.samba.org>
Cc: ab at samba.org
Subject: [Fwd: Re: [PATCH] waf: Utils package not defined]
Date: Fri, 30 Nov 2018 08:36:35 +0100

Thanks Alexander !

Could we get a second reviewer for this tiny pfix. please ?

I gave it a run on GitLab, which it passed.
A merge request is created as well
https://gitlab.com/samba-team/samba/merge_requests/120

...hope all this was done as wanted/expected.

Thanks for your support in advance.

Cheers Swen

-------- Forwarded Message --------
From: Alexander Bokovoy via samba-technical <
samba-technical at lists.samba.org>
Reply-To: Alexander Bokovoy <ab at samba.org>
To: swen at linux.ibm.com
Cc: samba-technical <samba-technical at lists.samba.org>
Subject: Re: [PATCH] waf: Utils package not defined
Date: Mon, 26 Nov 2018 22:35:55 +0200

On ma, 26 marras 2018, swen via samba-technical wrote:
> Please review and push if happy.
> 
> Thanks for your support in advance.

LGTM.

Do we have a test for --with-system-heimdalkrb5?

> 
> Cheers Swen
> From c076752160e74a52b6a99b3a0149af2d5b353ba6 Mon Sep 17 00:00:00
> 2001
> From: Swen Schillig <swen at linux.ibm.com>
> Date: Mon, 26 Nov 2018 20:14:21 +0100
> Subject: [PATCH] waf: Utils package not defined
> 
> Fix the package name for the WafError routine.
> 
> Signed-off-by: Swen Schillig <swen at linux.ibm.com>
> ---
>  wscript | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/wscript b/wscript
> index c5d8e5bdd7d..13261026b38 100644
> --- a/wscript
> +++ b/wscript
> @@ -220,11 +220,11 @@ def configure(conf):
>  
>      if Options.options.with_system_heimdalkrb5:
>          if Options.options.with_system_mitkrb5:
> -            raise Utils.WafError('--with-system-heimdalkrb5
> conflicts with ' +
> -                                 '--with-system-mitkrb5')
> +            raise Errors.WafError('--with-system-heimdalkrb5
> conflicts with ' +
> +                                  '--with-system-mitkrb5')
>          if not Options.options.without_ad_dc:
> -            raise Utils.WafError('--with-system-heimdalkrb5 requires
> ' +
> -                                 '--without-ad-dc')
> +            raise Errors.WafError('--with-system-heimdalkrb5
> requires ' +
> +                                  '--without-ad-dc')
>          conf.env.SYSTEM_LIBS += ('heimdal', 'asn1', 'com_err',
> 'roken',
>                                   'hx509', 'wind', 'gssapi',
> 'hcrypto',
>                                   'krb5', 'heimbase', 'asn1_compile',
> -- 
> 2.17.2
> 


-- 
/ Alexander Bokovoy