aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-02 10:09:43 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-05 14:58:48 +0100
commita0eaf8c0f228f984bafff09e4e9739f758dc1a9b (patch)
tree7fd2281fda75e6b86cda1821e04a7da329e29b6b
parent13f52d38fdbcb84c2a0c46f85baa44b22d53fdc1 (diff)
downloadbitbake-a0eaf8c0f228f984bafff09e4e9739f758dc1a9b.tar.gz
bitbake-a0eaf8c0f228f984bafff09e4e9739f758dc1a9b.tar.bz2
bitbake-a0eaf8c0f228f984bafff09e4e9739f758dc1a9b.zip
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@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index f5ae831c..90de40d6 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1171,13 +1171,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)