summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-14 21:40:40 +0100
committerSteve Sakoman <steve@sakoman.com>2020-07-16 08:26:36 -1000
commit9e23163016b7a8fea0dbfe2111f9493017e5a7b2 (patch)
tree1096d4f39230d103a9a20648f7eb0b198c683a73
parent797f7e0c3ff0610a4de321eaf82f84bca610624e (diff)
downloadopenembedded-core-9e23163016b7a8fea0dbfe2111f9493017e5a7b2.tar.gz
oeqa/utils/qemurunner: Fix missing pid file tracebacks
One element of the error message guarded against None as a value but I missed the other, fix this. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit dbce6baec68d7658453b8c44159e1d1fef746151) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 41c6bb33d6..01cbf52b8b 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -261,7 +261,7 @@ class QemuRunner:
qemu_pid = f.read().strip()
self.logger.error("Status information, poll status: %s, pidfile exists: %s, pidfile contents %s, proc pid exists %s"
- % (self.runqemu.poll(), os.path.isfile(self.qemu_pidfile), str(qemu_pid), os.path.exists("/proc/" + qemu_pid)))
+ % (self.runqemu.poll(), os.path.isfile(self.qemu_pidfile), str(qemu_pid), os.path.exists("/proc/" + str(qemu_pid))))
# Dump all processes to help us to figure out what is going on...
ps = subprocess.Popen(['ps', 'axww', '-o', 'pid,ppid,command '], stdout=subprocess.PIPE).communicate()[0]