[oe-commits] [bitbake] 06/45: buildinfohelper: improve handling of providermap

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit f6dcb1c9967f042beae024146781cb8235a9e1f2
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Wed Apr 6 17:46:16 2016 +0100

    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 at linux.intel.com>
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/ui/buildinfohelper.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 448f263..14be221 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,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.