diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-07-11 17:34:24 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 13:48:52 +0100 |
commit | dac68d2323b0b630c019ce4d5256ed567eaf00da (patch) | |
tree | cc3d283e96b11a6a940aaca06003c89da1d598d3 | |
parent | a779a382b66e7b43ac53286758b4370dc14b193b (diff) | |
download | openembedded-core-dac68d2323b0b630c019ce4d5256ed567eaf00da.tar.gz openembedded-core-dac68d2323b0b630c019ce4d5256ed567eaf00da.tar.bz2 openembedded-core-dac68d2323b0b630c019ce4d5256ed567eaf00da.zip |
runqemu: check exit code of 'ls -t'
Used check_output instead of Popen as it raises CalledProcessError
exception when command exits with non-zero exit code.
Catched the exception to produce user-friendly output.
[YOCTO #11719]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rwxr-xr-x | scripts/runqemu | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index c33741d804..d44afc7e7a 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -676,7 +676,10 @@ class BaseConfig(object): else: cmd = 'ls -t %s/*.qemuboot.conf' % deploy_dir_image logger.info('Running %s...' % cmd) - qbs = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') + try: + qbs = subprocess.check_output(cmd, shell=True).decode('utf-8') + except subprocess.CalledProcessError as err: + raise RunQemuError(err) if qbs: for qb in qbs.split(): # Don't use initramfs when other choices unless fstype is ramfs |