diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-14 21:40:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-22 22:46:38 +0100 |
commit | 4c211b471e1a2c311fbbc8d90a3deee65e300c9f (patch) | |
tree | 2bc1241236f7c546141c2a144ea86afe79d29570 /meta/lib | |
parent | cb28cbbff45183171aa7f01c6122e3c7c35fadcc (diff) | |
download | poky-4c211b471e1a2c311fbbc8d90a3deee65e300c9f.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.
(From OE-Core rev: 9e23163016b7a8fea0dbfe2111f9493017e5a7b2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit dbce6baec68d7658453b8c44159e1d1fef746151)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 2 |
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: | |||
261 | qemu_pid = f.read().strip() | 261 | qemu_pid = f.read().strip() |
262 | 262 | ||
263 | self.logger.error("Status information, poll status: %s, pidfile exists: %s, pidfile contents %s, proc pid exists %s" | 263 | self.logger.error("Status information, poll status: %s, pidfile exists: %s, pidfile contents %s, proc pid exists %s" |
264 | % (self.runqemu.poll(), os.path.isfile(self.qemu_pidfile), str(qemu_pid), os.path.exists("/proc/" + qemu_pid))) | 264 | % (self.runqemu.poll(), os.path.isfile(self.qemu_pidfile), str(qemu_pid), os.path.exists("/proc/" + str(qemu_pid)))) |
265 | 265 | ||
266 | # Dump all processes to help us to figure out what is going on... | 266 | # Dump all processes to help us to figure out what is going on... |
267 | ps = subprocess.Popen(['ps', 'axww', '-o', 'pid,ppid,command '], stdout=subprocess.PIPE).communicate()[0] | 267 | ps = subprocess.Popen(['ps', 'axww', '-o', 'pid,ppid,command '], stdout=subprocess.PIPE).communicate()[0] |