* [PATCH] bitbake: ConfHandler: Allow variable flag name with a single character
@ 2023-04-11 6:06 kai.kang
2023-04-11 8:44 ` [bitbake-devel] " Ola x Nilsson
0 siblings, 1 reply; 3+ messages in thread
From: kai.kang @ 2023-04-11 6:06 UTC (permalink / raw)
To: bitbake-devel
From: Kai Kang <kai.kang@windriver.com>
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.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 +-
bitbake/lib/bb/tests/parse.py | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 05c627ec8b..0bfe357012 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -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>:=) |
diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py
index d27c7c6f15..a3165d95bd 100644
--- a/bitbake/lib/bb/tests/parse.py
+++ b/bitbake/lib/bb/tests/parse.py
@@ -222,6 +222,7 @@ VAR = " \\
at_sign_in_var_flag = """
A[flag@.service] = "nonet"
B[flag@.target] = "ntb"
+C[f] = "flag"
unset A[flag@.service]
"""
@@ -232,6 +233,7 @@ unset A[flag@.service]
self.assertEqual(d.getVar("B"), None)
self.assertEqual(d.getVarFlag("A","flag@.service"), None)
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):
invalid_at_sign = self.at_sign_in_var_flag.replace("B[f", "B[@f")
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [bitbake-devel] [PATCH] bitbake: ConfHandler: Allow variable flag name with a single character
2023-04-11 6:06 [PATCH] bitbake: ConfHandler: Allow variable flag name with a single character kai.kang
@ 2023-04-11 8:44 ` Ola x Nilsson
2023-04-11 9:00 ` Kai
0 siblings, 1 reply; 3+ messages in thread
From: Ola x Nilsson @ 2023-04-11 8:44 UTC (permalink / raw)
To: bitbake-devel
On Tue, Apr 11 2023, Kai Kang wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> 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.
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 +-
> bitbake/lib/bb/tests/parse.py | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
> index 05c627ec8b..0bfe357012 100644
> --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
> +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
> @@ -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\-_+.@]+)?)\])?
It would be better to use the simpler expression
(\[(?P<flag>[a-zA-Z0-9\-_+.][a-zA-Z0-9\-_+.@]*)\])?
/Ola
> \s* (
> (?P<colon>:=) |
> diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py
> index d27c7c6f15..a3165d95bd 100644
> --- a/bitbake/lib/bb/tests/parse.py
> +++ b/bitbake/lib/bb/tests/parse.py
> @@ -222,6 +222,7 @@ VAR = " \\
> at_sign_in_var_flag = """
> A[flag@.service] = "nonet"
> B[flag@.target] = "ntb"
> +C[f] = "flag"
>
> unset A[flag@.service]
> """
> @@ -232,6 +233,7 @@ unset A[flag@.service]
> self.assertEqual(d.getVar("B"), None)
> self.assertEqual(d.getVarFlag("A","flag@.service"), None)
> 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):
> invalid_at_sign = self.at_sign_in_var_flag.replace("B[f", "B[@f")
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [bitbake-devel] [PATCH] bitbake: ConfHandler: Allow variable flag name with a single character
2023-04-11 8:44 ` [bitbake-devel] " Ola x Nilsson
@ 2023-04-11 9:00 ` Kai
0 siblings, 0 replies; 3+ messages in thread
From: Kai @ 2023-04-11 9:00 UTC (permalink / raw)
To: Ola x Nilsson, bitbake-devel
On 4/11/23 16:44, Ola x Nilsson wrote:
> On Tue, Apr 11 2023, Kai Kang wrote:
>
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> 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.
>>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>> bitbake/lib/bb/parse/parse_py/ConfHandler.py | 2 +-
>> bitbake/lib/bb/tests/parse.py | 2 ++
>> 2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
>> index 05c627ec8b..0bfe357012 100644
>> --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
>> +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
>> @@ -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\-_+.@]+)?)\])?
> It would be better to use the simpler expression
> (\[(?P<flag>[a-zA-Z0-9\-_+.][a-zA-Z0-9\-_+.@]*)\])?
Oh, yes, it is better. Thanks and v2 will be sent.
Kai
>
>
> /Ola
>
>
>> \s* (
>> (?P<colon>:=) |
>> diff --git a/bitbake/lib/bb/tests/parse.py b/bitbake/lib/bb/tests/parse.py
>> index d27c7c6f15..a3165d95bd 100644
>> --- a/bitbake/lib/bb/tests/parse.py
>> +++ b/bitbake/lib/bb/tests/parse.py
>> @@ -222,6 +222,7 @@ VAR = " \\
>> at_sign_in_var_flag = """
>> A[flag@.service] = "nonet"
>> B[flag@.target] = "ntb"
>> +C[f] = "flag"
>>
>> unset A[flag@.service]
>> """
>> @@ -232,6 +233,7 @@ unset A[flag@.service]
>> self.assertEqual(d.getVar("B"), None)
>> self.assertEqual(d.getVarFlag("A","flag@.service"), None)
>> 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):
>> invalid_at_sign = self.at_sign_in_var_flag.replace("B[f", "B[@f")
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#14690): https://lists.openembedded.org/g/bitbake-devel/message/14690
> Mute This Topic: https://lists.openembedded.org/mt/98192343/3616933
> Group Owner: bitbake-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/bitbake-devel/unsub [kai.kang@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Kai Kang
Wind River Linux
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-11 9:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-11 6:06 [PATCH] bitbake: ConfHandler: Allow variable flag name with a single character kai.kang
2023-04-11 8:44 ` [bitbake-devel] " Ola x Nilsson
2023-04-11 9:00 ` Kai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).