diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-24 15:22:23 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-16 14:08:32 +0100 |
| commit | 6eb56624e6d8dc1944e559b4f6584bfe66f566ba (patch) | |
| tree | 3c771b98203b274a1897ddeb30701dd2f5be108c | |
| parent | c46f183b3ea94789dd83cb280a1bf5735189c9bc (diff) | |
| download | bitbake-6eb56624e6d8dc1944e559b4f6584bfe66f566ba.tar.gz | |
data_smart: Don't cache/process capitalised overrides
Bitbake now only processes overrides which are lowercase since
this allows variables like SRC_URI not to pollute the cache.
There was a corner case where XXX_append_SomeThing was still being
processed (yet XXX_append_SomeThing_SomeOtherThing would not be).
This patch ensures we're consistent and only process lowercase
_append/_prepend and _remove operators too.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/data_smart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 7dc1c6870..7b09af5cf 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -39,7 +39,7 @@ from bb.COW import COWDictBase logger = logging.getLogger("BitBake.Data") __setvar_keyword__ = ["_append", "_prepend", "_remove"] -__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>.*))?$') +__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>[^A-Z]*))?$') __expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}") __expand_python_regexp__ = re.compile(r"\${@.+?}") |