summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/build.py7
-rw-r--r--bitbake/lib/bb/event.py4
2 files changed, 0 insertions, 11 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 42d1726daa..07bd35afcc 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -304,11 +304,6 @@ def _exec_task(fn, task, d, quieterr):
304 os.dup2(logfile.fileno(), oso[1]) 304 os.dup2(logfile.fileno(), oso[1])
305 os.dup2(logfile.fileno(), ose[1]) 305 os.dup2(logfile.fileno(), ose[1])
306 306
307 # Since we've remapped stdout and stderr, its safe for log messages to be printed there now
308 # exec_func can nest so we have to save state
309 origstdout = bb.event.useStdout
310 bb.event.useStdout = True
311
312 # Ensure python logging goes to the logfile 307 # Ensure python logging goes to the logfile
313 handler = logging.StreamHandler(logfile) 308 handler = logging.StreamHandler(logfile)
314 handler.setFormatter(logformatter) 309 handler.setFormatter(logformatter)
@@ -334,8 +329,6 @@ def _exec_task(fn, task, d, quieterr):
334 329
335 bblogger.removeHandler(handler) 330 bblogger.removeHandler(handler)
336 331
337 bb.event.useStdout = origstdout
338
339 # Restore the backup fds 332 # Restore the backup fds
340 os.dup2(osi[0], osi[1]) 333 os.dup2(osi[0], osi[1])
341 os.dup2(oso[0], oso[1]) 334 os.dup2(oso[0], oso[1])
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index bd2042a99c..3467ddd613 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -36,7 +36,6 @@ import bb.utils
36# the runqueue forks off. 36# the runqueue forks off.
37worker_pid = 0 37worker_pid = 0
38worker_pipe = None 38worker_pipe = None
39useStdout = True
40 39
41class Event(object): 40class Event(object):
42 """Base class for events""" 41 """Base class for events"""
@@ -162,7 +161,6 @@ def remove(name, handler):
162def register_UIHhandler(handler): 161def register_UIHhandler(handler):
163 bb.event._ui_handler_seq = bb.event._ui_handler_seq + 1 162 bb.event._ui_handler_seq = bb.event._ui_handler_seq + 1
164 _ui_handlers[_ui_handler_seq] = handler 163 _ui_handlers[_ui_handler_seq] = handler
165 bb.event.useStdout = False
166 return _ui_handler_seq 164 return _ui_handler_seq
167 165
168def unregister_UIHhandler(handlerNum): 166def unregister_UIHhandler(handlerNum):
@@ -382,8 +380,6 @@ class LogHandler(logging.Handler):
382 380
383 def emit(self, record): 381 def emit(self, record):
384 fire(record, None) 382 fire(record, None)
385 if bb.event.useStdout:
386 print(self.format(record))
387 383
388 def filter(self, record): 384 def filter(self, record):
389 record.taskpid = worker_pid 385 record.taskpid = worker_pid