mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-29 07:36:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: bitbake: ConfHandler: Allow variable flag name with a single character

Browse Source 
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.

(Bitbake rev: bb9e523291a3cad6e1596ee6a1e715b5e5feba8f)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2023-04-11 17:09:04 +08:00
committed by Richard Purdie
parent 066f44b161
commit a99566dac1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitbake/lib/bb/parse/parse_py/ConfHandler.py
View File

@@ -21,7 +21,7 @@ __config_regexp__ = re.compile( r"""
^ ^
(?P<exp>export\s+)? (?P<exp>export\s+)?
(?P<var>[a-zA-Z0-9\-_+.${}/~:]+?) (?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* ( \s* (
(?P<colon>:=) | (?P<colon>:=) |

2
bitbake/lib/bb/tests/parse.py
View File

@@ -222,6 +222,7 @@ VAR = " \\
at_sign_in_var_flag = """ at_sign_in_var_flag = """
A[flag@.service] = "nonet" A[flag@.service] = "nonet"
B[flag@.target] = "ntb" B[flag@.target] = "ntb"
C[f] = "flag"
unset A[flag@.service] unset A[flag@.service]
""" """
@@ -232,6 +233,7 @@ unset A[flag@.service]
self.assertEqual(d.getVar("B"), None) self.assertEqual(d.getVar("B"), None)
self.assertEqual(d.getVarFlag("A","flag@.service"), None) self.assertEqual(d.getVarFlag("A","flag@.service"), None)
self.assertEqual(d.getVarFlag("B","flag@.target"), "ntb") self.assertEqual(d.getVarFlag("B","flag@.target"), "ntb")
self.assertEqual(d.getVarFlag("C","f"), "flag")
def test_parse_invalid_at_sign_in_var_flag(self): def test_parse_invalid_at_sign_in_var_flag(self):
invalid_at_sign = self.at_sign_in_var_flag.replace("B[f", "B[@f") invalid_at_sign = self.at_sign_in_var_flag.replace("B[f", "B[@f")