[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6422/8267] bitbake: toaster: fail on layers with sub-layer

[Emmanuele Bassi <ebassi src gnome org>]

commit 1d7a768dbbbc71a4ac83b08c83a0066c1e8b1522
Author: David Reyna <David Reyna windriver com>
Date:   Wed Jun 14 21:48:31 2017 -0700

    bitbake: toaster: fail on layers with sub-layer
    
    For layers directories with sub-layers (for example meta-intel),
    Toaster breaks when trying to exact match a dependency event for
    that sub-layer against the top level layer directory paths.
    
    Given that top the level layer directory paths are unique, adding
    a test to see if the dependency path is a subset of a top level
    path is also unique.
    
    Also, since a warning was issued the processing should not fail
    on the assert but instead should continue and gather the recipes
    and tasks.
    
    [YOCTO #11149]
    
    (Bitbake rev: 6f1a42af19220a6a8d75790893da995e84ecd7aa)
    
    Signed-off-by: David Reyna <David Reyna windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/ui/buildinfohelper.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 46be5a5..3f8d63d 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -981,6 +981,7 @@ class BuildInfoHelper(object):
             pathRE = pathRE[:-1]
 
         p = re.compile(pathRE)
+        path=re.sub(r'[$^]',r'',pathRE)
         # Heuristics: we always match recipe to the deepest layer path in
         # the discovered layers
         for lvo in sorted(self.orm_wrapper.layer_version_objects,
@@ -990,12 +991,16 @@ class BuildInfoHelper(object):
             if lvo.layer.local_source_dir:
                 if p.fullmatch(os.path.abspath(lvo.layer.local_source_dir)):
                     return lvo
+            if 0 == path.find(lvo.local_path):
+                # sub-layer path inside existing layer
+                return lvo
 
         # if we get here, we didn't read layers correctly;
         # dump whatever information we have on the error log
         logger.warning("Could not match layer dependency for path %s : %s",
                        pathRE,
                        self.orm_wrapper.layer_version_objects)
+        return None
 
     def _get_layer_version_for_path(self, path):
         self._ensure_build()
@@ -1396,9 +1401,9 @@ class BuildInfoHelper(object):
             for lv in event._depgraph['layer-priorities']:
                 (_, path, _, priority) = lv
                 layer_version_obj = self._get_layer_version_for_dependency(path)
-                assert layer_version_obj is not None
-                layer_version_obj.priority = priority
-                layer_version_obj.save()
+                if layer_version_obj:
+                    layer_version_obj.priority = priority
+                    layer_version_obj.save()
 
         # save recipe information
         self.internal_state['recipes'] = {}