From 37e13b852b33d98fa40f49dc1e815b3bbe912ff0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 20 Sep 2013 15:26:32 +0000 Subject: data_smart: Variable references don't contain newlines, spaces or tabs The code is happily trying to expand variable names containing newlines, spaces and tabs which are illegal characters in variable names. This patch stops it doing this. This will change dependency checksums since some rather weird dependencies were being attempted to be expanded. Signed-off-by: Richard Purdie --- lib/bb/data_smart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/bb/data_smart.py') diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 71b67e458..b6f5b78cd 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -40,7 +40,7 @@ logger = logging.getLogger("BitBake.Data") __setvar_keyword__ = ["_append", "_prepend", "_remove"] __setvar_regexp__ = re.compile('(?P.*?)(?P_append|_prepend|_remove)(_(?P.*))?$') -__expand_var_regexp__ = re.compile(r"\${[^{}@]+}") +__expand_var_regexp__ = re.compile(r"\${[^{}@\n\t ]+}") __expand_python_regexp__ = re.compile(r"\${@.+?}") def infer_caller_details(loginfo, parent = False, varval = True): -- cgit 1.2.3-korg