summaryrefslogtreecommitdiffstats
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-01 11:38:36 +0000
commitce17f3b67960ee8be534c846e2076aaf6d87e3e2 (patch)
tree2b94ab85ceb405d9b1a12c3c1d2f13ae09b8b7e8
parentf33fb239d60953aa3014bf694ab6d115054e5ab5 (diff)
downloadpoky-ce17f3b67960ee8be534c846e2076aaf6d87e3e2.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) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 e6a35d3d25..2e6a2289cd 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -345,11 +345,11 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None,
345 yield qemu 345 yield qemu
346 346
347 finally: 347 finally:
348 targetlogger.removeHandler(handler)
348 try: 349 try:
349 qemu.stop() 350 qemu.stop()
350 except: 351 except:
351 pass 352 pass
352 targetlogger.removeHandler(handler)
353 353
354def updateEnv(env_file): 354def updateEnv(env_file):
355 """ 355 """