From 0119a8791ca0ec728df8f7b7de00d813fec30857 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Fri, 2 Feb 2018 16:34:33 +0200 Subject: [PATCH] third_party/wscript: update to handle waf 2.0.4 Signed-off-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett --- third_party/wscript | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/third_party/wscript b/third_party/wscript index 9a86dfe44e3..c4744b7a589 100644 --- a/third_party/wscript +++ b/third_party/wscript @@ -1,10 +1,9 @@ #!/usr/bin/env python -import samba_git -import Options -import Utils import os import sys +import samba_git +from waflib import Options, Utils # work out what python external libraries we need to install external_pkgs = { @@ -25,11 +24,11 @@ def find_third_party_module(conf, module, package): old_path = sys.path try: - sys.path.append(os.path.join(conf.curdir, os.path.dirname(package))) + sys.path.append(os.path.join(conf.path.abspath(), os.path.dirname(package))) try: __import__(module) except ImportError: - if samba_git.has_submodules(conf.srcdir): + if samba_git.has_submodules(conf.srcnode.abspath()): raise Utils.WafError("""\ Unable to find Python module '%s'. Please install the system package or check \ out the relevant submodule by running 'git submodule update --init'. -- 2.11.4.GIT