[oe-commits] [bitbake] 10/10: cooker.py: Fix layer priority processing
git at git.openembedded.org
git at git.openembedded.org
Thu Sep 21 15:56:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch 1.34
in repository bitbake.
commit 1db8336cee8cd22aaaa67e3dde5b9218840ba4a1
Author: Mark Hatle <mark.hatle at windriver.com>
AuthorDate: Sat Sep 2 10:09:43 2017 -0500
cooker.py: Fix layer priority processing
If you have a layer with a blank BBFILE_PATTERN the layer was ignored
when processing the list of layers with priorities. This list is not
only used for processing recipes, but also by additional programs such
as bitbake-layers show-layers.
Without this change, a layer that provides configuration or classes
only does now show up in show-layers, which is used by the
yocto-compat-layer.py script. This causes a failures in the compatibility
check.
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/cooker.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index d254bd2..7521ae8 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1293,13 +1293,13 @@ class BBCooker:
elif regex == "":
parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c)
errors = False
- continue
- try:
- cre = re.compile(regex)
- except re.error:
- parselog.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression", c, regex)
- errors = True
- continue
+ else:
+ try:
+ cre = re.compile(regex)
+ except re.error:
+ parselog.error("BBFILE_PATTERN_%s \"%s\" is not a valid regular expression", c, regex)
+ errors = True
+ continue
self.bbfile_config_priorities.append((c, regex, cre, collection_priorities[c]))
if errors:
# We've already printed the actual error(s)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list