summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-28 13:00:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-16 14:31:32 +0000
commit1cd8b3b7897b62a80d744ba7828b01a13519347a (patch)
tree458bc032dc337c60af9948d40ede20378b0c3075 /meta/lib/oeqa
parentce291652c502980f86df891b09d2063df2fb4a30 (diff)
downloadpoky-1cd8b3b7897b62a80d744ba7828b01a13519347a.tar.gz
oeqa/utils/commands: Avoid log message duplication
Each time a runqemu() fails, the log handler would be left behind meaning messages from any subsequent run would be duplicated (or worse/more). This ensures we remove the handler regardless and means we no longer have the duplication. (From OE-Core rev: 532984708436bdfa3a8cac2c684a425eb249bad0) (From OE-Core rev: 018549bf94d1e5d33344691fde0fb27ca50f675f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r--meta/lib/oeqa/utils/commands.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 933af92dce..da705295bc 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -342,11 +342,11 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
342 yield qemu 342 yield qemu
343 343
344 finally: 344 finally:
345 targetlogger.removeHandler(handler)
345 try: 346 try:
346 qemu.stop() 347 qemu.stop()
347 except: 348 except:
348 pass 349 pass
349 targetlogger.removeHandler(handler)
350 350
351def updateEnv(env_file): 351def updateEnv(env_file):
352 """ 352 """