diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2017-09-02 10:09:43 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-21 16:50:52 +0100 |
commit | 1db8336cee8cd22aaaa67e3dde5b9218840ba4a1 (patch) | |
tree | 53ff0230990e19a340c568c82131893bf8ebb2ec | |
parent | b408dfae3685494ae34417e72c586b9eb0ddace9 (diff) | |
download | bitbake-contrib-1db8336cee8cd22aaaa67e3dde5b9218840ba4a1.tar.gz |
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.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index d254bd279..7521ae878 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) |