[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3203/8267] bitbake: lib/bb/cooker.py: fix for BBFILE_PATTERN = ""



commit edb5b524b3ee807d55a437cbab3d768c5f6f2283
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Oct 27 01:50:18 2016 -0700

    bitbake: lib/bb/cooker.py: fix for BBFILE_PATTERN = ""
    
    There would be error when BBFILE_PATTERN = None:
      BBFILE_PATTERN_foo not defined
    
    This is the correct behaviour, but when the layer sets BBFILE_PATTERN = "",
    it would match all the remaining recipes, and cause "No bb files matched BBFILE_PATTERN"
    warnings for all the layers which behind it.
    
    When a layer sets BBFILE_PATTERN = "" (for example, a layer only
    provides git repos and source tarballs), now it means has no recipes.
    This is different from BBFILE_PATTERN_IGNORE_EMPTY, the later one means
    that it *may* not have any recipes.
    
    (Bitbake rev: 91c3b34625fac2a0f093a4b46a46e89f813e7972)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cooker.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 42831e2..c08af45 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1240,6 +1240,10 @@ class BBCooker:
                     parselog.error("BBFILE_PATTERN_%s not defined" % c)
                     errors = True
                     continue
+                elif regex == "":
+                    parselog.debug(1, "BBFILE_PATTERN_%s is empty" % c)
+                    errors = False
+                    continue
                 try:
                     cre = re.compile(regex)
                 except re.error:


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