[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4680/8267] bitbake: cooker: detect malformed BBMASK expressions which begin with a separator



commit 7ab8b6558c568399769cfbad4e480981558768d9
Author: Andre McCurdy <armccurdy gmail com>
Date:   Wed Feb 1 13:09:16 2017 -0800

    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>

 bitbake/lib/bb/cooker.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index ce84e1c..662a7ac 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]