summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-11-24 11:20:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:48:10 +0000
commit6dba0281e1de039c64098fbb0b32e6fd78ab53eb (patch)
tree77a28d1bb29f2e19a2a84a319e6b313b9829d317
parent439f3da1a1737fe111f77b13c8c20718bfe91f49 (diff)
downloadopenembedded-core-contrib-6dba0281e1de039c64098fbb0b32e6fd78ab53eb.tar.gz
openembedded-core-contrib-6dba0281e1de039c64098fbb0b32e6fd78ab53eb.tar.bz2
openembedded-core-contrib-6dba0281e1de039c64098fbb0b32e6fd78ab53eb.zip
bitbake: toaster: buildinfohelper fix _get_layer_version_for_dependency
This function is simplified by not trying to handle replacing the regex and just compiling and using it for matching. - Fix typo in logger output with undefined variable - Fix pyflake errors (Bitbake rev: ea298ece8d678889cd5bcde46e00545e9a73edb9) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py32
1 files changed, 20 insertions, 12 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 43a1411fa0..63c779e81f 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -965,9 +965,10 @@ class BuildInfoHelper(object):
return task_information
def _get_layer_version_for_dependency(self, pathRE):
- """ Returns the layer in the toaster db that has a full regex match to the pathRE.
- pathRE - the layer path passed as a regex in the event. It is created in
- cooker.py as a collection for the layer priorities.
+ """ Returns the layer in the toaster db that has a full regex
+ match to the pathRE. pathRE - the layer path passed as a regex in the
+ event. It is created in cooker.py as a collection for the layer
+ priorities.
"""
self._ensure_build()
@@ -975,19 +976,26 @@ class BuildInfoHelper(object):
assert isinstance(layer_version, Layer_Version)
return len(layer_version.local_path)
- # we don't care if we match the trailing slashes
- p = re.compile(re.sub("/[^/]*?$","",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, reverse=True, key=_sort_longest_path):
- if p.fullmatch(lvo.local_path):
+ # Our paths don't append a trailing slash
+ if pathRE.endswith("/"):
+ pathRE = pathRE[:-1]
+
+ p = re.compile(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,
+ reverse=True, key=_sort_longest_path):
+ if p.fullmatch(os.path.abspath(lvo.local_path)):
return lvo
if lvo.layer.local_source_dir:
- if p.fullmatch(lvo.layer.local_source_dir):
+ if p.fullmatch(os.path.abspath(lvo.layer.local_source_dir)):
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", path, self.orm_wrapper.layer_version_objects)
-
+ # 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)
def _get_layer_version_for_path(self, path):
self._ensure_build()