]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/utils/qemurunner: Fix missing pid file tracebacks
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 14 Jul 2020 20:40:40 +0000 (21:40 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 14 Jul 2020 20:41:36 +0000 (21:41 +0100)
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>
meta/lib/oeqa/utils/qemurunner.py

index 41c6bb33d62c1598c8fc66a82cc057e069bb7632..01cbf52b8b1e6968b780c1dda2eec652ac913ed1 100644 (file)
@@ -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]