summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-02-01 13:09:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-19 06:28:46 -0800
commit7ab8b6558c568399769cfbad4e480981558768d9 (patch)
tree02fe5e5a4419bd89d476307b891051fce2c1dc09
parent6cfc1c83b90c9c9dd5290749aed49896327739e6 (diff)
downloadopenembedded-core-contrib-7ab8b6558c568399769cfbad4e480981558768d9.tar.gz
openembedded-core-contrib-7ab8b6558c568399769cfbad4e480981558768d9.tar.bz2
openembedded-core-contrib-7ab8b6558c568399769cfbad4e480981558768d9.zip
bitbake: cooker: detect malformed BBMASK expressions which begin with a separator
When constructing an older style single regex, it's possible for BBMASK to end up beginning with '|', which matches and masks _everything_. (Bitbake rev: 56ad67017e601c7e0f6085ca84e29c28d8d4519f) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index ce84e1c745..662a7ac071 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1900,6 +1900,11 @@ class CookerCollectFiles(object):
# that do not compile
bbmasks = []
for mask in bbmask.split():
+ # When constructing an older style single regex, it's possible for BBMASK
+ # to end up beginning with '|', which matches and masks _everything_.
+ if mask.startswith("|"):
+ collectlog.warn("BBMASK contains regular expression beginning with '|', fixing: %s" % mask)
+ mask = mask[1:]
try:
re.compile(mask)
bbmasks.append(mask)