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-18 13:19:55 +0100 |
| commit | 8238165be5fbf832a06b447bc00dc41c865a878b (patch) | |
| tree | 98d1d7cb6dd71b7e7e682fae010f946d30ce83ea /bitbake/lib | |
| parent | b7626dc36f97d62dbf8a68b2061f5f93cd567b64 (diff) | |
| download | poky-8238165be5fbf832a06b447bc00dc41c865a878b.tar.gz | |
bitbake: 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.
(Bitbake rev: 6eb56624e6d8dc1944e559b4f6584bfe66f566ba)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 7dc1c68709..7b09af5cf1 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
| @@ -39,7 +39,7 @@ from bb.COW import COWDictBase | |||
| 39 | logger = logging.getLogger("BitBake.Data") | 39 | logger = logging.getLogger("BitBake.Data") |
| 40 | 40 | ||
| 41 | __setvar_keyword__ = ["_append", "_prepend", "_remove"] | 41 | __setvar_keyword__ = ["_append", "_prepend", "_remove"] |
| 42 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>.*))?$') | 42 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>[^A-Z]*))?$') |
| 43 | __expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}") | 43 | __expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}") |
| 44 | __expand_python_regexp__ = re.compile(r"\${@.+?}") | 44 | __expand_python_regexp__ = re.compile(r"\${@.+?}") |
| 45 | 45 | ||