mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-24 13:36:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

For ${@}, run str() on the result

Browse Source 
(Bitbake rev: cf1a51eab11f645c95e5fa278221f78c129b9dd1)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Chris Larson
2010-04-20 15:54:42 -07:00
committed by Richard Purdie
parent 15248f3e7d
commit 1e7a03cb58
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/lib/bb/data_smart.py
View File

@@ -65,9 +65,8 @@ class DataSmart:
def python_sub(match): def python_sub(match):
code = match.group()[3:-1] code = match.group()[3:-1]
codeobj = compile(code.strip(), varname or "<expansion>", "eval") codeobj = compile(code.strip(), varname or "<expansion>", "eval")
s = utils.better_eval(codeobj, {"d": self}) value = utils.better_eval(codeobj, {"d": self})
if isinstance(s, int): s = str(s) return str(value)
return s
if not isinstance(s, basestring): # sanity check if not isinstance(s, basestring): # sanity check
return s return s
@@ -80,9 +79,8 @@ class DataSmart:
try: try:
s = __expand_var_regexp__.sub(var_sub, s) s = __expand_var_regexp__.sub(var_sub, s)
s = __expand_python_regexp__.sub(python_sub, s) s = __expand_python_regexp__.sub(python_sub, s)
if s == olds: break if s == olds:
if not isinstance(s, basestring): # sanity check break
bb.msg.error(bb.msg.domain.Data, 'expansion of %s returned non-string %s' % (olds, s))
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except: except: