From 1e7a03cb580eb722a85297d6ffcbf55716e938d5 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 20 Apr 2010 15:54:42 -0700 Subject: For ${@}, run str() on the result (Bitbake rev: cf1a51eab11f645c95e5fa278221f78c129b9dd1) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 9436023b30..1e65014028 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -65,9 +65,8 @@ class DataSmart: def python_sub(match): code = match.group()[3:-1] codeobj = compile(code.strip(), varname or "", "eval") - s = utils.better_eval(codeobj, {"d": self}) - if isinstance(s, int): s = str(s) - return s + value = utils.better_eval(codeobj, {"d": self}) + return str(value) if not isinstance(s, basestring): # sanity check return s @@ -80,9 +79,8 @@ class DataSmart: try: s = __expand_var_regexp__.sub(var_sub, s) s = __expand_python_regexp__.sub(python_sub, s) - if s == olds: break - if not isinstance(s, basestring): # sanity check - bb.msg.error(bb.msg.domain.Data, 'expansion of %s returned non-string %s' % (olds, s)) + if s == olds: + break except KeyboardInterrupt: raise except: -- cgit v1.2.3-54-g00ecf