bitbake: ConfHandler: Allow variable flag name with a single character
PATCH v2 1/1 bitbake: ConfHandler: Allow variable flag name with a single character
From: Kai Kang <[email protected]>
Update regex pattern to allow variable flag name with a single character.
Regression tests have also been updated in bb.parse and bin/bitbake-selftest -k ParseTest has been successfully executed.
Eliminate a trailing space as well.
Signed-off-by Kai Kang <[email protected]>
--- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 4 ++-- bitbake/lib/bb/tests/parse.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-)
bitbake/lib/bb/parse/parse_py/ConfHandler.py +2 -2
@@ -21,7 +21,7 @@ __config_regexp__ = re.compile( r""" ^ (?P<exp>export\s+)? (?P<var>[a-zA-Z0-9\-_+.${}/~:]+?) - (\[(?P<flag>[a-zA-Z0-9\-_+.][a-zA-Z0-9\-_+.@]+)\])? + (\[(?P<flag>[a-zA-Z0-9\-_+.][a-zA-Z0-9\-_+.@]*)\])? \s* ( (?P<colon>:=) |
@@ -103,7 +103,7 @@ def include_single_file(parentfn, fn, lineno, data, error_out): # We have an issue where a UI might want to enforce particular settings such as # an empty DISTRO variable. If configuration files do something like assigning # a weak default, it turns out to be very difficult to filter out these changes, -# particularly when the weak default might appear half way though parsing a chain +# particularly when the weak default might appear half way though parsing a chain # of configuration files. We therefore let the UIs hook into configuration file # parsing. This turns out to be a hard problem to solve any other way. confFilters = []
bitbake/lib/bb/tests/parse.py +2 -0
@@ -222,6 +222,7 @@ VAR = " \\ at_sign_in_var_flag = """ A[[email protected]] = "nonet" B[[email protected]] = "ntb" +C[f] = "flag" unset A[[email protected]] """
@@ -232,6 +233,7 @@ unset A[[email protected]] self.assertEqual(d.getVar("B"), None) self.assertEqual(d.getVarFlag("A","[email protected]"), None) self.assertEqual(d.getVarFlag("B","[email protected]"), "ntb") + self.assertEqual(d.getVarFlag("C","f"), "flag") def test_parse_invalid_at_sign_in_var_flag(self): invalid_at_sign = self.at_sign_in_var_flag.replace("B[f", "B[@f")
Signature · 1 line
2.17.1