mirror of https://gitlab.com/ita1024/waf.git
issue #856
This commit is contained in:
parent
bde0ca40d1
commit
ce5241dc26
|
@ -378,11 +378,7 @@ class Context(ctx):
|
||||||
p = subprocess.Popen(cmd, **kw)
|
p = subprocess.Popen(cmd, **kw)
|
||||||
(out, err) = p.communicate()
|
(out, err) = p.communicate()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
try:
|
raise Errors.WafError('Execution failure: %s' % str(e), ex=e)
|
||||||
self.to_log(str(err))
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
raise Errors.WafError('Execution failure', ex=e)
|
|
||||||
|
|
||||||
if not isinstance(out, str):
|
if not isinstance(out, str):
|
||||||
out = out.decode(sys.stdout.encoding or 'iso8859-1')
|
out = out.decode(sys.stdout.encoding or 'iso8859-1')
|
||||||
|
@ -395,7 +391,7 @@ class Context(ctx):
|
||||||
self.to_log('err: %s' % err)
|
self.to_log('err: %s' % err)
|
||||||
|
|
||||||
if p.returncode:
|
if p.returncode:
|
||||||
e = Errors.WafError('command %r returned %r' % (cmd, p.returncode))
|
e = Errors.WafError('Command %r returned %r' % (cmd, p.returncode))
|
||||||
e.returncode = p.returncode
|
e.returncode = p.returncode
|
||||||
e.stderr = err
|
e.stderr = err
|
||||||
e.stdout = out
|
e.stdout = out
|
||||||
|
|
Loading…
Reference in New Issue