summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-04 15:39:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-05 11:45:16 +0100
commit175e5f27021f84b0c567f7dda15fa229eaaa95f9 (patch)
treec7581582d4b47052c0000e4e9093a3ce5a3d5e6c /bitbake
parentf6a40d457cf175eb1979f3a5bc62c76d939a21d0 (diff)
downloadpoky-175e5f27021f84b0c567f7dda15fa229eaaa95f9.tar.gz
bitbake: server/process: Don't show tracebacks if the lockfile is removed
lsof/fuser error if the file doesn't exist. It can be deleted by something else so ignore this if it happens and loop. (Bitbake rev: b100d22ce37b7548b50e59a71802bcc903acd6ea) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/server/process.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 2be4588a4f..f794505fd4 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -286,6 +286,9 @@ class ProcessServer():
286 procs = None 286 procs = None
287 try: 287 try:
288 procs = subprocess.check_output(["lsof", '-w', lockfile], stderr=subprocess.STDOUT) 288 procs = subprocess.check_output(["lsof", '-w', lockfile], stderr=subprocess.STDOUT)
289 except subprocess.CalledProcessError:
290 # File was deleted?
291 continue
289 except OSError as e: 292 except OSError as e:
290 if e.errno != errno.ENOENT: 293 if e.errno != errno.ENOENT:
291 raise 294 raise
@@ -293,6 +296,9 @@ class ProcessServer():
293 # Fall back to fuser if lsof is unavailable 296 # Fall back to fuser if lsof is unavailable
294 try: 297 try:
295 procs = subprocess.check_output(["fuser", '-v', lockfile], stderr=subprocess.STDOUT) 298 procs = subprocess.check_output(["fuser", '-v', lockfile], stderr=subprocess.STDOUT)
299 except subprocess.CalledProcessError:
300 # File was deleted?
301 continue
296 except OSError as e: 302 except OSError as e:
297 if e.errno != errno.ENOENT: 303 if e.errno != errno.ENOENT:
298 raise 304 raise