@@ -91,8 +91,9 @@ class TaskSucceeded(TaskBase):
class TaskFailed(TaskBase):
"""Task execution failed"""
- def __init__(self, task, logfile, metadata):
+ def __init__(self, task, logfile, metadata, errprinted = False):
self.logfile = logfile
+ self.errprinted = errprinted
super(TaskFailed, self).__init__(task, metadata)
class TaskInvalid(TaskBase):
@@ -286,6 +287,13 @@ def _exec_task(fn, task, d, quieterr):
prefuncs = localdata.getVarFlag(task, 'prefuncs', expand=True)
postfuncs = localdata.getVarFlag(task, 'postfuncs', expand=True)
+ class ErrorCheckHandler(logging.Handler):
+ def __init__(self):
+ self.triggered = False
+ logging.Handler.__init__(self, logging.ERROR)
+ def emit(self, record):
+ self.triggered = True
+
# Handle logfiles
si = file('/dev/null', 'r')
try:
@@ -311,6 +319,9 @@ def _exec_task(fn, task, d, quieterr):
handler.setLevel(logging.DEBUG - 2)
bblogger.addHandler(handler)
+ errchk = ErrorCheckHandler()
+ bblogger.addHandler(errchk)
+
localdata.setVar('BB_LOGFILE', logfn)
event.fire(TaskStarted(task, localdata), localdata)
@@ -322,8 +333,9 @@ def _exec_task(fn, task, d, quieterr):
exec_func(func, localdata)
except FuncFailed as exc:
if not quieterr:
+ errprinted = errchk.triggered
logger.error(str(exc))
- event.fire(TaskFailed(task, logfn, localdata), localdata)
+ event.fire(TaskFailed(task, logfn, localdata, errprinted), localdata)
return 1
finally:
sys.stdout.flush()
@@ -366,7 +378,7 @@ def exec_task(fn, task, d):
if not quieterr:
logger.error("Build of %s failed" % (task))
logger.error(format_exc())
- failedevent = TaskFailed(task, None, d)
+ failedevent = TaskFailed(task, None, d, True)
event.fire(failedevent, d)
return 1
@@ -142,7 +142,7 @@ def main(server, eventHandler):
logfile = event.logfile
if logfile and os.path.exists(logfile):
print("ERROR: Logfile of failure stored in: %s" % logfile)
- if 1 or includelogs:
+ if includelogs and not event.errprinted:
print("Log data follows:")
f = open(logfile, "r")
lines = []
If a task has logged an ERROR then don't print the contents of the task's log file in knotty (the default terminal UI). As a side-effect we now also respect BBINCLUDELOGS in knotty; if it is false we never print the log (but the pointer to the log file is always printed). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- bitbake/lib/bb/build.py | 18 +++++++++++++++--- bitbake/lib/bb/ui/knotty.py | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-)