From: Alexander Bokovoy Date: Wed, 27 Jun 2018 13:34:53 +0000 (+0300) Subject: buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0 X-Git-Tag: tdb-1.3.17~1793 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aebcd698764d9c8e55db14b7650481a1992ee938;p=thirdparty%2Fsamba.git buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0 Signed-off-by: Alexander Bokovoy Reviewed-by: Andrew Bartlett --- diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py index 5191acb7c04..b4643c037d9 100644 --- a/buildtools/wafsamba/samba_cross.py +++ b/buildtools/wafsamba/samba_cross.py @@ -118,8 +118,8 @@ class cross_Popen(Utils.subprocess.Popen): newargs.extend(args[0:i]) if use_answers: p = real_Popen(newargs, - stdout=Utils.pproc.PIPE, - stderr=Utils.pproc.PIPE) + stdout=Utils.subprocess.PIPE, + stderr=Utils.subprocess.PIPE) ce_out, ce_err = p.communicate() ans = (p.returncode, ce_out) add_answer(ca_file, msg, ans) @@ -144,8 +144,8 @@ def SAMBA_CROSS_ARGS(conf, msg=None): global real_Popen if real_Popen is None: - real_Popen = Utils.pproc.Popen - Utils.pproc.Popen = cross_Popen + real_Popen = Utils.subprocess.Popen + Utils.subprocess.Popen = cross_Popen ret = []