]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: server/process.py: fix self.bitbake_lock.write()
authorRobert Yang <liezhi.yang@windriver.com>
Fri, 14 Jul 2017 09:52:03 +0000 (02:52 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 21 Jul 2017 07:41:11 +0000 (08:41 +0100)
There is no global var "configuration", so the old code hang at
self.bitbake_lock.write(), and nothing wrote to bitbake.lock. I didn't
figure out why it hang (but not print errors).

Reproducer:
$ bitbake -B localhost:-1 world -k

Check bitbake.log, there was nothing, now fixed.

(Bitbake rev: dbdd9010663cd8dcb328e1b6fb40e3a777293bc5)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/bb/server/process.py

index 6edb0213ad6747d6ae4f466da51cecf955eeef8c..01d9f2f014a950c04601626a99d9ed3be8d562bd 100644 (file)
@@ -95,8 +95,8 @@ class ProcessServer(multiprocessing.Process):
         try:
             self.bitbake_lock.seek(0)
             self.bitbake_lock.truncate()
-            if self.xmlrpcinterface[0]:
-                self.bitbake_lock.write("%s %s:%s\n" % (os.getpid(), configuration.interface[0], configuration.interface[1]))
+            if self.xmlrpc:
+                self.bitbake_lock.write("%s %s:%s\n" % (os.getpid(), self.xmlrpc.host, self.xmlrpc.port))
             else:
                 self.bitbake_lock.write("%s\n" % (os.getpid()))
             self.bitbake_lock.flush()