summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/parse/parse_py/BBHandler.py
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-20 11:53:31 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:34 +0100
commitc3eae29efa2318ee4f12b1e1c8d562e18d1cee87 (patch)
tree66adc15f52ffd35621389d9de05df3adf76a1f90 /bitbake/lib/bb/parse/parse_py/BBHandler.py
parent214d1f7433fd8571c3e0920624ce07f31c7f08c9 (diff)
downloadpoky-c3eae29efa2318ee4f12b1e1c8d562e18d1cee87.tar.gz
Don't try to expand non-string values
(Bitbake rev: fe36a726b9f930bbd6fd758c0aee78559e95f02b) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py')
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index a388773bb7..52fd8285ed 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -68,8 +68,8 @@ def inherit(files, d):
68 __inherit_cache = data.getVar('__inherit_cache', d) or [] 68 __inherit_cache = data.getVar('__inherit_cache', d) or []
69 fn = "" 69 fn = ""
70 lineno = 0 70 lineno = 0
71 files = data.expand(files, d)
72 for file in files: 71 for file in files:
72 file = data.expand(file, d)
73 if file[0] != "/" and file[-8:] != ".bbclass": 73 if file[0] != "/" and file[-8:] != ".bbclass":
74 file = os.path.join('classes', '%s.bbclass' % file) 74 file = os.path.join('classes', '%s.bbclass' % file)
75 75