[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6814/8267] bitbake: server/process.py: fix self.bitbake_lock.write()
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 6814/8267] bitbake: server/process.py: fix self.bitbake_lock.write()
- Date: Sun, 17 Dec 2017 05:22:22 +0000 (UTC)
commit 47ce5bb034350795ad13af4ba1a3457c39506e37
Author: Robert Yang <liezhi yang windriver com>
Date: Fri Jul 14 02:52:03 2017 -0700
bitbake: server/process.py: fix self.bitbake_lock.write()
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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 6edb021..01d9f2f 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -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()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]