buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0
authorAlexander Bokovoy <ab@samba.org>
Wed, 27 Jun 2018 13:34:53 +0000 (16:34 +0300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 5 Sep 2018 04:37:26 +0000 (06:37 +0200)
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
buildtools/wafsamba/samba_cross.py

index 5191acb7c04d0d6bd52f0ba5724acd293c61a3af..b4643c037d97f108e95a37f9ea330ad1acda1941 100644 (file)
@@ -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 = []