bitbake: toaster: buildinfohelper: Use correct way to get message from LogMessage
Use the correct method to get a message value from the LogMessage object rather than constructing it ourselves which is not recommended. This causes an exception when the msg contains a '%' such as when there are wildcards in file names (something2.%.bbappends) (Bitbake rev: 11b3b6a7087554d14a2812a9ae463dce740b879e) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: bavery <brian.avery@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fffce32ebd
commit
25ea0b625d
|
@ -1565,16 +1565,12 @@ class BuildInfoHelper(object):
|
||||||
mockevent.lineno = -1
|
mockevent.lineno = -1
|
||||||
self.store_log_event(mockevent)
|
self.store_log_event(mockevent)
|
||||||
|
|
||||||
|
|
||||||
def store_log_event(self, event):
|
def store_log_event(self, event):
|
||||||
self._ensure_build()
|
self._ensure_build()
|
||||||
|
|
||||||
if event.levelno < formatter.WARNING:
|
if event.levelno < formatter.WARNING:
|
||||||
return
|
return
|
||||||
|
|
||||||
if 'args' in vars(event):
|
|
||||||
event.msg = event.msg % event.args
|
|
||||||
|
|
||||||
# early return for CLI builds
|
# early return for CLI builds
|
||||||
if self.brbe is None:
|
if self.brbe is None:
|
||||||
if not 'backlog' in self.internal_state:
|
if not 'backlog' in self.internal_state:
|
||||||
|
@ -1586,7 +1582,8 @@ class BuildInfoHelper(object):
|
||||||
# if we have a backlog of events, do our best to save them here
|
# if we have a backlog of events, do our best to save them here
|
||||||
if len(self.internal_state['backlog']):
|
if len(self.internal_state['backlog']):
|
||||||
tempevent = self.internal_state['backlog'].pop()
|
tempevent = self.internal_state['backlog'].pop()
|
||||||
logger.debug(1, "buildinfohelper: Saving stored event %s " % tempevent)
|
logger.debug(1, "buildinfohelper: Saving stored event %s "
|
||||||
|
% tempevent)
|
||||||
self.store_log_event(tempevent)
|
self.store_log_event(tempevent)
|
||||||
else:
|
else:
|
||||||
logger.info("buildinfohelper: All events saved")
|
logger.info("buildinfohelper: All events saved")
|
||||||
|
@ -1605,7 +1602,7 @@ class BuildInfoHelper(object):
|
||||||
else:
|
else:
|
||||||
log_information['level'] = LogMessage.INFO
|
log_information['level'] = LogMessage.INFO
|
||||||
|
|
||||||
log_information['message'] = event.msg
|
log_information['message'] = event.getMessage()
|
||||||
log_information['pathname'] = event.pathname
|
log_information['pathname'] = event.pathname
|
||||||
log_information['lineno'] = event.lineno
|
log_information['lineno'] = event.lineno
|
||||||
logger.info("Logging error 2: %s", log_information)
|
logger.info("Logging error 2: %s", log_information)
|
||||||
|
|
Loading…
Reference in New Issue