diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-20 12:25:19 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-20 12:26:19 +0100 |
commit | 616e75523b0b1bbe730631dba70224b55cfaaa57 (patch) | |
tree | 2fd396d58386217135976c1747ddfde94b84e9f8 /bitbake/lib/bb/build.py | |
parent | 9708f9cba7923fa0b5a620e032ab3d9e085385a7 (diff) | |
download | poky-616e75523b0b1bbe730631dba70224b55cfaaa57.tar.gz |
bitbake: Correctly route events from the worker to the server
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/build.py')
-rw-r--r-- | bitbake/lib/bb/build.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 77af92abee..f49b2836b6 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -152,6 +152,9 @@ def exec_func(func, d, dirs = None): | |||
152 | os.dup2(so.fileno(), oso[1]) | 152 | os.dup2(so.fileno(), oso[1]) |
153 | os.dup2(se.fileno(), ose[1]) | 153 | os.dup2(se.fileno(), ose[1]) |
154 | 154 | ||
155 | # Since we've remapped stdout and stderr, its safe for log messages to be printed there now | ||
156 | # exec_func can nest so we have to save state | ||
157 | origstdout = bb.event.useStdout | ||
155 | bb.event.useStdout = True | 158 | bb.event.useStdout = True |
156 | 159 | ||
157 | locks = [] | 160 | locks = [] |
@@ -179,7 +182,10 @@ def exec_func(func, d, dirs = None): | |||
179 | for lock in locks: | 182 | for lock in locks: |
180 | bb.utils.unlockfile(lock) | 183 | bb.utils.unlockfile(lock) |
181 | 184 | ||
182 | bb.event.useStdout = False | 185 | sys.stdout.flush() |
186 | sys.stderr.flush() | ||
187 | |||
188 | bb.event.useStdout = origstdout | ||
183 | 189 | ||
184 | # Restore the backup fds | 190 | # Restore the backup fds |
185 | os.dup2(osi[0], osi[1]) | 191 | os.dup2(osi[0], osi[1]) |