[SCM] Samba Shared Repository - branch master updated
Alexander Bokovoy
ab at samba.org
Tue Dec 4 17:46:03 UTC 2018
The branch, master has been updated
via dfbfb7eb941 waf: Utils package not defined
from 5517d60653b traffic_replay: Add a max-members option to cap group size
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit dfbfb7eb941b68ce75adc3ece25915b2eefaf886
Author: Swen Schillig <swen at linux.ibm.com>
Date: Mon Nov 26 20:14:21 2018 +0100
waf: Utils package not defined
Fix the package name for the WafError routine.
Signed-off-by: Swen Schillig <swen at linux.ibm.com>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Alexander Bokovoy <ab at samba.org>
Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
Autobuild-Date(master): Tue Dec 4 18:45:38 CET 2018 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
third_party/aesni-intel/wscript | 8 ++++----
third_party/wscript | 6 +++---
wscript | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/third_party/aesni-intel/wscript b/third_party/aesni-intel/wscript
index bb874454ca6..955b5162140 100644
--- a/third_party/aesni-intel/wscript
+++ b/third_party/aesni-intel/wscript
@@ -1,6 +1,6 @@
#!/usr/bin/env python
from waflib import Options
-from waflib import Utils
+from waflib import Errors
def configure(conf):
if Options.options.accel_aes.lower() == "intelaesni":
@@ -14,11 +14,11 @@ def configure(conf):
print("Compiling with Intel AES instructions")
conf.DEFINE('HAVE_AESNI_INTEL', 1)
else:
- raise Utils.WafError('--accel-aes=intelaesni selected and non x86_64 CPU')
+ raise Errors.WafError('--accel-aes=intelaesni selected and non x86_64 CPU')
else:
- raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags))
+ raise Errors.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags))
if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'):
- raise Utils.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack')
+ raise Errors.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack')
def build(bld):
if not bld.CONFIG_SET('HAVE_AESNI_INTEL'):
diff --git a/third_party/wscript b/third_party/wscript
index c4744b7a589..f7a6daff0dd 100644
--- a/third_party/wscript
+++ b/third_party/wscript
@@ -3,7 +3,7 @@
import os
import sys
import samba_git
-from waflib import Options, Utils
+from waflib import Options, Errors
# work out what python external libraries we need to install
external_pkgs = {
@@ -29,12 +29,12 @@ def find_third_party_module(conf, module, package):
__import__(module)
except ImportError:
if samba_git.has_submodules(conf.srcnode.abspath()):
- raise Utils.WafError("""\
+ raise Errors.WafError("""\
Unable to find Python module '%s'. Please install the system package or check \
out the relevant submodule by running 'git submodule update --init'.
""" % module)
else:
- raise Utils.WafError("""\
+ raise Errors.WafError("""\
Unable to find Python module '%s'. Please install the system package or place a copy in
%s.
""" % (module, package))
diff --git a/wscript b/wscript
index c06a2e38a87..da4254efde4 100644
--- a/wscript
+++ b/wscript
@@ -237,11 +237,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',
--
Samba Shared Repository
More information about the samba-cvs
mailing list