From: Noel Power <noel.power@suse.com>
Date: Mon, 6 Aug 2018 14:02:18 +0000 (+0100)
Subject: PY3: relative import fixes
X-Git-Tag: tdb-1.3.17~1242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca12342b0a07ca707823cd35be12dc806fa46a89;p=thirdparty%2Fsamba.git

PY3: relative import fixes
---

diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index b5c6da46b93..80db7f87be5 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -7,7 +7,7 @@ import fnmatch
 
 from waflib import Options, Utils, Logs, Task, Build, Errors
 from waflib.TaskGen import feature, before, after
-import samba_utils
+from wafsamba import samba_utils
 
 # these type maps cope with platform specific names for common types
 # please add new type mappings into the list below
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index fea4cb2bc3c..60ce7da7232 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -3,7 +3,7 @@
 import sys
 from waflib import Build, Options, Logs
 from waflib.Configure import conf
-from samba_utils import TO_LIST
+from wafsamba import samba_utils
 
 def PRIVATE_NAME(bld, name, private_extension, private_library):
     '''possibly rename a library to include a bundled extension'''
@@ -139,7 +139,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
     # We always do a logic validation of 'onlyif' first
     missing = []
     if onlyif:
-        for l in TO_LIST(onlyif):
+        for l in samba_utils.TO_LIST(onlyif):
             f = 'FOUND_SYSTEMLIB_%s' % l
             if not f in conf.env:
                 Logs.error('ERROR: CHECK_BUNDLED_SYSTEM(%s) - ' % (libname) +