From 5809483b78902df5e8162ca74e923369b1cb3bf3 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Mon, 8 Mar 2010 13:35:08 -0800 Subject: [PATCH] Upgrade waf to 1.5.14a --- tools/wafadmin/Tools/config_c.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/wafadmin/Tools/config_c.py b/tools/wafadmin/Tools/config_c.py index 5663fb8b8e..6008265dda 100644 --- a/tools/wafadmin/Tools/config_c.py +++ b/tools/wafadmin/Tools/config_c.py @@ -541,8 +541,10 @@ def run_c_code(self, *k, **kw): # if we need to run the program, try to get its result if kw['execute']: + ak = {} # syntax for python < 2.5, don't touch + ak['stdout'] = ak['stderr'] = Utils.pproc.PIPE args = Utils.to_list(kw.get('exec_args', [])) - proc = Utils.pproc.Popen([lastprog], *args, stdout=Utils.pproc.PIPE, stderr=Utils.pproc.PIPE) + proc = Utils.pproc.Popen([lastprog], *args, **ak) (out, err) = proc.communicate() w = self.log.write w(str(out))