better handling of stdout
This commit is contained in:
parent
5c382202f7
commit
64dee75762
@ -159,9 +159,8 @@ class ElementRunner(object):
|
|||||||
logging.info("Blacklisting %s" % blacklisted_script)
|
logging.info("Blacklisting %s" % blacklisted_script)
|
||||||
os.unlink(os.path.join(hook_dir, blacklisted_script))
|
os.unlink(os.path.join(hook_dir, blacklisted_script))
|
||||||
|
|
||||||
rc, stdout = call(['dib-run-parts', hook_dir],
|
rc = call(['dib-run-parts', hook_dir],
|
||||||
stdout=sys.stdout, stderr=sys.stderr,
|
env=os.environ)
|
||||||
env=os.environ)
|
|
||||||
|
|
||||||
if rc != 0:
|
if rc != 0:
|
||||||
logging.error("dib-run-parts hook failed: %s" % hook_dir)
|
logging.error("dib-run-parts hook failed: %s" % hook_dir)
|
||||||
@ -183,16 +182,11 @@ def call(command, **kwargs):
|
|||||||
logging.info('executing command: %s' % command)
|
logging.info('executing command: %s' % command)
|
||||||
|
|
||||||
p = subprocess.Popen(command,
|
p = subprocess.Popen(command,
|
||||||
|
stdout=sys.stdout,
|
||||||
|
stderr=sys.stderr,
|
||||||
**kwargs)
|
**kwargs)
|
||||||
|
|
||||||
rc = p.wait()
|
rc = p.wait()
|
||||||
|
|
||||||
if p.stdout:
|
|
||||||
stdout = p.stdout.read()
|
|
||||||
print(stdout)
|
|
||||||
else:
|
|
||||||
stdout = None
|
|
||||||
|
|
||||||
logging.info(' exited with code: %s' % rc)
|
logging.info(' exited with code: %s' % rc)
|
||||||
|
|
||||||
return rc, stdout
|
return rc
|
||||||
|
Loading…
Reference in New Issue
Block a user