summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-11 09:24:44 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-11 23:00:38 +0100
commitfb1027896a263cd91e2378a4e97dbdf0807b306b (patch)
treef13e7b2f6f574fd663dab71b2aea16758b846b37
parent3279e43fcb469edb63c7c4eb60fdc565d5751f9d (diff)
downloadopenembedded-core-contrib-fb1027896a263cd91e2378a4e97dbdf0807b306b.tar.gz
oeqa/qemurunner: Handle files no longer existing gracefully
Files in /proc/xxx/map_files/ may no longer exist, just ignore this rather than raising an exception. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/qemurunner.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index 10c54d6afa..5c9d2b24a3 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -359,13 +359,16 @@ class QemuRunner:
mapdir = "/proc/" + str(self.qemupid) + "/map_files/"
try:
for f in os.listdir(mapdir):
- linktarget = os.readlink(os.path.join(mapdir, f))
- if not linktarget.startswith("/") or linktarget.startswith("/dev") or "deleted" in linktarget:
+ try:
+ linktarget = os.readlink(os.path.join(mapdir, f))
+ if not linktarget.startswith("/") or linktarget.startswith("/dev") or "deleted" in linktarget:
+ continue
+ with open(linktarget, "rb") as readf:
+ data = True
+ while data:
+ data = readf.read(4096)
+ except FileNotFoundError:
continue
- with open(linktarget, "rb") as readf:
- data = True
- while data:
- data = readf.read(4096)
# Centos7 doesn't allow us to read /map_files/
except PermissionError:
pass