summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-03 09:24:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-03 09:25:10 (GMT)
commit9df0a20d9562322162676ed2606bf4b0a1bd6726 (patch)
tree824cdfd18ba4bf1e84ea942422a08f474879107c /bitbake
parent71cc9de357484c469cc3a46f013b11c84c924aa0 (diff)
downloadpoky-9df0a20d9562322162676ed2606bf4b0a1bd6726.tar.gz
bitbake: data_smart: Fix unanchored regexp causing strange parsing issue
If this regular expression is unanchored, it would accept strings like: do_install_append1 do_install_appendsomelongstring and treat them like they were do_install_append. Clearly this isn't desirable. Only one instance of this type of issue was found in OE-Core and has been fixed so correcting the regexp should be safe to do. (Bitbake rev: 23bd5300b4a99218a15f4f6b0ab4091d63a602a5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data_smart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 730deaa..31216e0 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -39,7 +39,7 @@ from bb.COW import COWDictBase
39logger = logging.getLogger("BitBake.Data") 39logger = logging.getLogger("BitBake.Data")
40 40
41__setvar_keyword__ = ["_append", "_prepend"] 41__setvar_keyword__ = ["_append", "_prepend"]
42__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?') 42__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?$')
43__expand_var_regexp__ = re.compile(r"\${[^{}]+}") 43__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
44__expand_python_regexp__ = re.compile(r"\${@.+?}") 44__expand_python_regexp__ = re.compile(r"\${@.+?}")
45 45