diff mbox series

[v3,4/4] data_smart: restore the ability to use capital letters

Message ID 1791899582.8631fc262581453bbf619ec5b2062170.1a13589c05b0008425@vates.tech
State New
Headers show
Series [v2,1/2] parse: add a (failing) test for a variable override with capital letters | expand

Commit Message

Yann Dirson Oct. 13, 2026, 1:52 p.m. UTC 
This reverts commit 6eb56624e6d8dc1944e559b4f6584bfe66f566ba.

That commit was meant as an ad-hoc band-aid when "_" was used as
override prefix, and it explicitly blocked capital letters from being
usable in the overrides.  There is no reason to keep it now we use ":"
as prefix.

Signed-off-by: Yann Dirson <yann.dirson@vates.tech>
---
 lib/bb/data_smart.py  | 2 +-
 lib/bb/tests/parse.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index a6e4bddb6..a95c08425 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -31,7 +31,7 @@  from bb.COW  import COWDictBase
 logger = logging.getLogger("BitBake.Data")
 
 __setvar_keyword__ = [":append", ":prepend", ":remove"]
-__setvar_regexp__ = re.compile(r'(?P<base>.*?)(?P<keyword>:append|:prepend|:remove)(:(?P<add>[^A-Z$]*))?$')
+__setvar_regexp__ = re.compile(r'(?P<base>.*?)(?P<keyword>:append|:prepend|:remove)(:(?P<add>[^$]*))?$')
 __expand_var_regexp__ = re.compile(r"\${[a-zA-Z0-9\-_+./~:]+}")
 __expand_python_regexp__ = re.compile(r"\${@(?:{.*?}|.)+?}")
 __whitespace_split__ = re.compile(r'(\s)')
diff --git a/lib/bb/tests/parse.py b/lib/bb/tests/parse.py
index 7e7dbd923..9fc094b16 100644
--- a/lib/bb/tests/parse.py
+++ b/lib/bb/tests/parse.py
@@ -157,7 +157,6 @@  RPROVIDES:perl-ExtUtils-MakeMaker = "base"
 RPROVIDES:perl-ExtUtils-MakeMaker:append:pn-ExtUtils-MakeMaker = " text"
 """
 
-    @unittest.expectedFailure
     def test_parse_mixedcase_pn_override(self):
         # Recipes named after CPAN distributions have mixed-case PNs, so
         # OVERRIDES contains a mixed-case pn-${PN} entry. An operation