diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-04-06 17:46:16 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-06 23:10:27 +0100 |
| commit | 5bcce68ea3cd5bec74336ae3172a4bd25f88385d (patch) | |
| tree | 910f8ceb21bef32e381f2d774f4a3c5d955d07a0 /bitbake/lib | |
| parent | 61b6b98f40bd92470b01312c54ef9e06e1762e14 (diff) | |
| download | openembedded-core-contrib-5bcce68ea3cd5bec74336ae3172a4bd25f88385d.tar.gz | |
bitbake: 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.
(Bitbake rev: f6dcb1c9967f042beae024146781cb8235a9e1f2)
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>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 448f263f5a..14be221726 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/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, |