summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-10 09:55:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:55:07 +0000
commit7db88aa67dc0701963eb69d937caf67cbb3a1637 (patch)
treed5935d922f04bc70ffd1a890aba7d2125b3e2b73
parent4c04ce0576f539ca71fcd69eb3739c150ae3b1c8 (diff)
downloadpoky-7db88aa67dc0701963eb69d937caf67cbb3a1637.tar.gz
bitbake: parse: Don't try to expand __base_depends/__depends
Trying to expand a variable which isn't a string doesn't make sense. (Bitbake rev: 62367cca1f1793eb9827406bcdd5980fdeb80a60) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/parse/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py
index 67ec71f866..26ae7ead86 100644
--- a/bitbake/lib/bb/parse/__init__.py
+++ b/bitbake/lib/bb/parse/__init__.py
@@ -161,8 +161,8 @@ def vars_from_file(mypkg, d):
161def get_file_depends(d): 161def get_file_depends(d):
162 '''Return the dependent files''' 162 '''Return the dependent files'''
163 dep_files = [] 163 dep_files = []
164 depends = d.getVar('__base_depends', True) or [] 164 depends = d.getVar('__base_depends', False) or []
165 depends = depends + (d.getVar('__depends', True) or []) 165 depends = depends + (d.getVar('__depends', False) or [])
166 for (fn, _) in depends: 166 for (fn, _) in depends:
167 dep_files.append(os.path.abspath(fn)) 167 dep_files.append(os.path.abspath(fn))
168 return " ".join(dep_files) 168 return " ".join(dep_files)