summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-06 17:46:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:00:10 +0100
commitf6dcb1c9967f042beae024146781cb8235a9e1f2 (patch)
tree6724154720d09431c33a4bfcb27d9ac331c4188c
parentf356c154016c428a3b53af61a075de6f14d9d1d9 (diff)
downloadopenembedded-core-contrib-f6dcb1c9967f042beae024146781cb8235a9e1f2.tar.gz
buildinfohelper: improve handling of providermap
DepTreeGenerated event doesn't contain 'providermap' data in jethro. Modified buildinfohelper to handle events without this data. This should make it possible to handle jethro events coming from jethro bitbake server by the latest buildinfohelper. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/ui/buildinfohelper.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 448f263f5a..14be221726 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/lib/bb/ui/buildinfohelper.py
@@ -1244,7 +1244,6 @@ class BuildInfoHelper(object):
assert 'layer-priorities' in event._depgraph
assert 'pn' in event._depgraph
assert 'tdepends' in event._depgraph
- assert 'providermap' in event._depgraph
errormsg = ""
@@ -1330,7 +1329,7 @@ class BuildInfoHelper(object):
if dep in assume_provided:
continue
via = None
- if dep in event._depgraph['providermap']:
+ if 'providermap' in event._depgraph and dep in event._depgraph['providermap']:
deprecipe = event._depgraph['providermap'][dep][0]
dependency = self.internal_state['recipes'][deprecipe]
via = Provides.objects.get_or_create(name=dep,