From 2c2d160c889ac03e47f58219375d558b8b9ce358 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 10 Jan 2011 13:12:35 +0000 Subject: bitbake: Update event queue handling to match upstream bitbake Signed-off-by: Richard Purdie --- bitbake/lib/bb/event.py | 2 -- bitbake/lib/bb/runqueue.py | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index 8b45501c00..450d913633 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py @@ -129,13 +129,11 @@ def fire(event, d): def worker_fire(event, d): data = "" + pickle.dumps(event) + "" worker_pipe.write(data) - worker_pipe.flush() def fire_from_worker(event, d): if not event.startswith("") or not event.endswith(""): print("Error, not an event %s" % event) return - #print "Got event %s" % event event = pickle.loads(event[7:-8]) fire_ui_handlers(event, d) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 8580f51693..054191b8c9 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1083,10 +1083,9 @@ class RunQueueExecute: sys.stdout.flush() sys.stderr.flush() try: - pipeinfd, pipeoutfd = os.pipe() - pipein = os.fdopen(pipeinfd, 'rb', 4096) - pipeout = os.fdopen(pipeoutfd, 'wb', 4096) - + pipein, pipeout = os.pipe() + pipein = os.fdopen(pipein, 'rb', 4096) + pipeout = os.fdopen(pipeout, 'wb', 0) pid = os.fork() except OSError as e: bb.msg.fatal(bb.msg.domain.RunQueue, "fork failed: %d (%s)" % (e.errno, e.strerror)) -- cgit 1.2.3-korg