summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/event.py3
-rw-r--r--bitbake/lib/bb/msg.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py
index 5a03a31f43..29b14f6c32 100644
--- a/bitbake/lib/bb/event.py
+++ b/bitbake/lib/bb/event.py
@@ -610,8 +610,9 @@ class LogHandler(logging.Handler):
610 if hasattr(tb, 'tb_next'): 610 if hasattr(tb, 'tb_next'):
611 tb = list(bb.exceptions.extract_traceback(tb, context=3)) 611 tb = list(bb.exceptions.extract_traceback(tb, context=3))
612 # Need to turn the value into something the logging system can pickle 612 # Need to turn the value into something the logging system can pickle
613 value = str(value)
614 record.bb_exc_info = (etype, value, tb) 613 record.bb_exc_info = (etype, value, tb)
614 record.bb_exc_formatted = bb.exceptions.format_exception(etype, value, tb, limit=5)
615 value = str(value)
615 record.exc_info = None 616 record.exc_info = None
616 fire(record, None) 617 fire(record, None)
617 618
diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py
index 786b5aef40..6fdd1f52a0 100644
--- a/bitbake/lib/bb/msg.py
+++ b/bitbake/lib/bb/msg.py
@@ -90,8 +90,9 @@ class BBLogFormatter(logging.Formatter):
90 if self.color_enabled: 90 if self.color_enabled:
91 record = self.colorize(record) 91 record = self.colorize(record)
92 msg = logging.Formatter.format(self, record) 92 msg = logging.Formatter.format(self, record)
93 93 if hasattr(record, 'bb_exc_formatted'):
94 if hasattr(record, 'bb_exc_info'): 94 msg += '\n' + ''.join(record.bb_exc_formatted)
95 elif hasattr(record, 'bb_exc_info'):
95 etype, value, tb = record.bb_exc_info 96 etype, value, tb = record.bb_exc_info
96 formatted = bb.exceptions.format_exception(etype, value, tb, limit=5) 97 formatted = bb.exceptions.format_exception(etype, value, tb, limit=5)
97 msg += '\n' + ''.join(formatted) 98 msg += '\n' + ''.join(formatted)