summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-04-02 11:56:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-05 14:55:28 +0100
commit53b781f41e71c359b66603a9786cf30cbaf73a65 (patch)
tree13f22b6898ad3fcd899b770e84793efe1369c322
parent1afb2a26200d3799a795135e8b2b6f3ab74bac36 (diff)
downloadpoky-53b781f41e71c359b66603a9786cf30cbaf73a65.tar.gz
bitbake: toasterui: save warnings from non-build context
Some warnings and errors may come from a non-build context, and they were not saved, even if they were counted for the current build. This patch saves these messages in memory until we have the entire build context available. [YOCTO #5642] (Bitbake rev: fc7a74e7961775b5d7ff25298abed10138d24dc9) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py18
-rw-r--r--bitbake/lib/bb/ui/toasterui.py3
2 files changed, 15 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index dd93d0b6c3..69655709d3 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -933,15 +933,23 @@ class BuildInfoHelper(object):
933 self._store_log_information(LogMessage.ERROR, text) 933 self._store_log_information(LogMessage.ERROR, text)
934 934
935 def store_log_event(self, event): 935 def store_log_event(self, event):
936 # look up license files info from insane.bbclass 936 if 'build' in self.internal_state and 'backlog' in self.internal_state:
937 m = re.match("([^:]*): md5 checksum matched for ([^;]*)", event.msg) 937 if len(self.internal_state['backlog']):
938 if m: 938 tempevent = self.internal_state['backlog'].pop()
939 (pn, fn) = m.groups() 939 print "Saving stored event ", tempevent
940 self.internal_state['recipes'][pn].save() 940 self.store_log_event(tempevent)
941 else:
942 del self.internal_state['backlog']
941 943
942 if event.levelno < format.WARNING: 944 if event.levelno < format.WARNING:
943 return 945 return
946
944 if not 'build' in self.internal_state: 947 if not 'build' in self.internal_state:
948 print "Save event for later"
949 if not 'backlog' in self.internal_state:
950 self.internal_state['backlog'] = []
951 self.internal_state['backlog'].append(event)
952
945 return 953 return
946 log_information = {} 954 log_information = {}
947 log_information['build'] = self.internal_state['build'] 955 log_information['build'] = self.internal_state['build']
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 37d6b1a0cf..9a9fe6f2d8 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -143,6 +143,8 @@ def main(server, eventHandler, params ):
143 143
144 # these events are unprocessed now, but may be used in the future to log 144 # these events are unprocessed now, but may be used in the future to log
145 # timing and error informations from the parsing phase in Toaster 145 # timing and error informations from the parsing phase in Toaster
146 if isinstance(event, (bb.event.SanityCheckPassed, bb.event.SanityCheck)):
147 continue
146 if isinstance(event, bb.event.ParseStarted): 148 if isinstance(event, bb.event.ParseStarted):
147 continue 149 continue
148 if isinstance(event, bb.event.ParseProgress): 150 if isinstance(event, bb.event.ParseProgress):
@@ -209,7 +211,6 @@ def main(server, eventHandler, params ):
209 continue 211 continue
210 212
211 if isinstance(event, (bb.event.BuildCompleted)): 213 if isinstance(event, (bb.event.BuildCompleted)):
212 buildinfohelper.update_build_information(event, errors, warnings, taskfailures)
213 continue 214 continue
214 215
215 if isinstance(event, (bb.command.CommandCompleted, 216 if isinstance(event, (bb.command.CommandCompleted,