buildtools/wafsamba: import 'sys' and 'Logs' if we use them

We should avoid generating a backtrace in a normal
error case, just because sys.exit(1) isn't known.

metze

diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py
index 4abf8d67d48c2c118c57de9867914490d47d11fb..09bfcb9c6beae581168961f544ad8ffe4dbef351 100644 (file)
--- a/buildtools/wafsamba/pkgconfig.py
+++ b/buildtools/wafsamba/pkgconfig.py
@@ -1,6 +1,6 @@
 # handle substitution of variables in pc files
 
-import Build
+import Build, sys, Logs
 from samba_utils import *
 
 def subst_at_vars(task):

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 1babe7b62d2cc7335b587ac38c086635f9dba617..91d8a56fe3866c2111713c9097de60415fa530f5 100644 (file)
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -1,6 +1,6 @@
 # a waf tool to add autoconf-like macros to the configure section
 
-import Build, os, Options, preproc, Logs
+import Build, os, sys, Options, preproc, Logs
 import string
 from Configure import conf
 from samba_utils import *

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index 9e02ca4a4b578a2a91cc8e9fec47c7fe5cd56de1..27234fb055f29c6f145964cfa19987ab202acfce 100644 (file)
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -1,7 +1,7 @@
 # functions to support bundled libraries
 
 from Configure import conf
-import Logs
+import sys, Logs
 from samba_utils import *
 
 def PRIVATE_NAME(bld, name, private_extension, private_library):

diff --git a/buildtools/wafsamba/samba_deps.py b/buildtools/wafsamba/samba_deps.py
index 6bd2cca99e1209fd21783d533f6e8c697e1b068a..c4a871e0132c7d3fd0f5fdcf69381ce5f8bfb70b 100644 (file)
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -1,6 +1,6 @@
 # Samba automatic dependency handling and project rules
 
-import Build, os, re, Environment, Logs, time
+import Build, os, sys, re, Environment, Logs, time
 from samba_utils import *
 from samba_autoconf import *
 from samba_bundled import BUILTIN_LIBRARY

diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index d5ac2174d2bd06a8541e57dbcdc5c1ceaafec74a..2770728a442e3e8948e3ff12c2954e8207d31e08 100644 (file)
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -1,7 +1,7 @@
 # waf build tool for building IDL files with pidl
 
 from TaskGen import before
-import Build, os
+import Build, os, sys, Logs
 from samba_utils import *
 
 def SAMBA_PIDL(bld, pname, source,

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index c532c4b413b42a9d4dba842d7c686ee63c83156d..571cd480c76c657dc3e4df6ddf30db1de65e2a55 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -1,7 +1,7 @@
 # a waf tool to add autoconf-like macros to the configure section
 # and for SAMBA_ macros for building libraries, binaries etc
 
-import Build, os, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs, Constants
+import Build, os, sys, Options, Task, Utils, cc, TaskGen, fnmatch, re, shutil, Logs, Constants
 from Configure import conf
 from Logs import debug
 from samba_utils import SUBST_VARS_RECURSIVE

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index d4e103e90e574a81764a6a60684519c798566b42..ad5b938df5fc22ae50ea7a4d0d6e6b6d986477f5 100644 (file)
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -2,7 +2,7 @@
 
 # this is a base set of waf rules that everything else pulls in first
 
-import sys, wafsamba, Configure
+import sys, wafsamba, Configure, Logs
 import Options, os, preproc
 from samba_utils import *
 from optparse import SUPPRESS_HELP