aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/runqemu.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-05 15:48:00 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-01 07:48:52 +1200
commit62c4df62df0b96f8dc4d3ddb37a3b3bfe9cc54a6 (patch)
treefbe787e2fc9e554fe0eacf06c5868e63ce7a6fec /scripts/lib/devtool/runqemu.py
parente2adf2542c28268aa3ad9329e32e01fb50b502b4 (diff)
downloadopenembedded-core-contrib-62c4df62df0b96f8dc4d3ddb37a3b3bfe9cc54a6.tar.gz
scripts: ensure tinfoil is shut down correctlypaule/tinfoil-fixes-oe
We should always shut down tinfoil when we're finished with it, either by explicitly calling the shutdown() method or by using it as a context manager ("with ..."). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'scripts/lib/devtool/runqemu.py')
-rw-r--r--scripts/lib/devtool/runqemu.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/lib/devtool/runqemu.py b/scripts/lib/devtool/runqemu.py
index daee7fbbe3..303abcae4f 100644
--- a/scripts/lib/devtool/runqemu.py
+++ b/scripts/lib/devtool/runqemu.py
@@ -30,9 +30,11 @@ def runqemu(args, config, basepath, workspace):
"""Entry point for the devtool 'runqemu' subcommand"""
tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
- machine = tinfoil.config_data.getVar('MACHINE', True)
- bindir_native = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE', True)
- tinfoil.shutdown()
+ try:
+ machine = tinfoil.config_data.getVar('MACHINE', True)
+ bindir_native = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE', True)
+ finally:
+ tinfoil.shutdown()
if not glob.glob(os.path.join(bindir_native, 'qemu-system-*')):
raise DevtoolError('QEMU is not available within this SDK')