sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

buildtools/wafsamba: crosscompile should use Utils.subprocess in waf 2.0

Browse Source 
Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Alexander Bokovoy 2018-06-27 16:34:53 +03:00 committed by Andrew Bartlett
parent fb43723bc1
commit aebcd69876
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildtools/wafsamba/samba_cross.py
View 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 = []