summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-01-05 12:16:15 +0100
committerStefan Metzmacher <metze@samba.org>2011-01-05 12:30:23 +0100
commite0a9b58de8bd86122d17c0330cb1f0330207c023 (patch)
tree55db7d6b38cefb421dee18ab8e558718179dc1cd
parentd89e7622407539786af72ea05dd1de7de9154228 (diff)
downloadsamba-e0a9b58de8bd86122d17c0330cb1f0330207c023.tar.gz
samba-e0a9b58de8bd86122d17c0330cb1f0330207c023.tar.bz2
samba-e0a9b58de8bd86122d17c0330cb1f0330207c023.zip
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
-rw-r--r--buildtools/wafsamba/pkgconfig.py2
-rw-r--r--buildtools/wafsamba/samba_autoconf.py2
-rw-r--r--buildtools/wafsamba/samba_bundled.py2
-rw-r--r--buildtools/wafsamba/samba_deps.py2
-rw-r--r--buildtools/wafsamba/samba_pidl.py2
-rw-r--r--buildtools/wafsamba/wafsamba.py2
-rw-r--r--buildtools/wafsamba/wscript2
7 files changed, 7 insertions, 7 deletions
diff --git a/buildtools/wafsamba/pkgconfig.py b/buildtools/wafsamba/pkgconfig.py
index 4abf8d67d4..09bfcb9c6b 100644
--- 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 1babe7b62d..91d8a56fe3 100644
--- 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 9e02ca4a4b..27234fb055 100644
--- 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 6bd2cca99e..c4a871e013 100644
--- 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 d5ac2174d2..2770728a44 100644
--- 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 c532c4b413..571cd480c7 100644
--- 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 d4e103e90e..ad5b938df5 100644
--- 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