sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Capture output in _exec_sudo"

Browse Source
This commit is contained in:
Jenkins 2017-03-23 01:01:13 +00:00 committed by Gerrit Code Review
commit f7999f86e4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
diskimage_builder/block_device/level1/partitioning.py
View File

@ -155,11 +155,13 @@ class Partitioning(object):
sudo_cmd = ["sudo"]
sudo_cmd.extend(cmd)
logger.info("Calling [%s]" % " ".join(sudo_cmd))
subp = subprocess.Popen(sudo_cmd)
rval = subp.wait()
if rval != 0:
# note we supress output, as it is captured
try:
subprocess.check_output(sudo_cmd, stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e:
logger.error("Calling [%s] failed with [%s]" %
(" ".join(sudo_cmd), rval))
(e.cmd, e.returncode))
logger.error(e.output)
logger.error("Trying to continue")
def _all_part_devices_exist(self, expected_part_devices):