[oe-commits] [bitbake] 01/02: ConfHandler.py: allow require or include without parameter

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 8b39c6361758b96fce50a53a6dba8008cd7e6433
Author: Patrick Ohly <patrick.ohly at intel.com>
AuthorDate: Wed Jun 7 15:56:24 2017 +0200

    ConfHandler.py: allow require or include without parameter
    
    Writing .bbappends that only have an effect when some configuration
    variable like DISTRO_FEATURES is changed becomes easier when allowing
    "include" or "require" without a parameter. The same was already
    allowed for "inherit".
    
    Then one can write in a .bbappend:
    
      require ${@bb.utils.contains('DISTRO_FEATURES', 'foo', 'bar.inc', '', d)}
    
    Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/parse/parse_py/ConfHandler.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py
index bf7e985..b006d06 100644
--- a/lib/bb/parse/parse_py/ConfHandler.py
+++ b/lib/bb/parse/parse_py/ConfHandler.py
@@ -81,6 +81,10 @@ def include(parentfn, fn, lineno, data, error_out):
     fn = data.expand(fn)
     parentfn = data.expand(parentfn)
 
+    if not fn:
+        # "include" or "require" without parameter is fine, just return.
+        return
+
     if not os.path.isabs(fn):
         dname = os.path.dirname(parentfn)
         bbpath = "%s:%s" % (dname, data.getVar("BBPATH"))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.