From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 29 Nov 2018 16:51:18 +0000 (+0000)
Subject: bitbake: server/process: Make lockfile handling clearer
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9439e0255e4cf9b7fc8d8b034395bceb4f285f8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: server/process: Make lockfile handling clearer

This simplifies the code and makes it easier to read but has the
same functionality.

(Bitbake rev: a0b9cfaf2d03fd047a79d32e668001718d02c4bf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 81617acd961..d56681c5a97 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -239,6 +239,12 @@ class ProcessServer(multiprocessing.Process):
         while not lock:
             with bb.utils.timeout(3):
                 lock = bb.utils.lockfile(lockfile, shared=False, retry=False, block=True)
+                if lock:
+                    # We hold the lock so we can remove the file (hide stale pid data)
+                    bb.utils.remove(lockfile)
+                    bb.utils.unlockfile(lock)
+                    return
+
                 if not lock:
                     # Some systems may not have lsof available
                     procs = None
@@ -259,10 +265,6 @@ class ProcessServer(multiprocessing.Process):
                     if procs:
                         msg += ":\n%s" % str(procs)
                     print(msg)
-                    return
-        # We hold the lock so we can remove the file (hide stale pid data)
-        bb.utils.remove(lockfile)
-        bb.utils.unlockfile(lock)
 
     def idle_commands(self, delay, fds=None):
         nextsleep = delay