summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-10 09:54:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:55:07 +0000
commit4c04ce0576f539ca71fcd69eb3739c150ae3b1c8 (patch)
tree6200927d5c01288d66d8cda50c7d44e23fa68c1f /bitbake
parent9d8e36a6c9663a1665ecefca59d172ad53f90ffe (diff)
downloadpoky-4c04ce0576f539ca71fcd69eb3739c150ae3b1c8.tar.gz
bitbake: cache: Don't try to expand __inherit_data
Trying to expand a variable which isn't a string doesn't make sense. (Bitbake rev: 54d0ddd166a6707b4f8c8535639e3055b783363b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cache.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index ab09b08b58..521f758282 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -85,8 +85,8 @@ class RecipeInfoCommon(object):
85 return out_dict 85 return out_dict
86 86
87 @classmethod 87 @classmethod
88 def getvar(cls, var, metadata): 88 def getvar(cls, var, metadata, expand = True):
89 return metadata.getVar(var, True) or '' 89 return metadata.getVar(var, expand) or ''
90 90
91 91
92class CoreRecipeInfo(RecipeInfoCommon): 92class CoreRecipeInfo(RecipeInfoCommon):
@@ -142,7 +142,7 @@ class CoreRecipeInfo(RecipeInfoCommon):
142 self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata) 142 self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata)
143 self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) 143 self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata)
144 self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata) 144 self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata)
145 self.inherits = self.getvar('__inherit_cache', metadata) 145 self.inherits = self.getvar('__inherit_cache', metadata, expand=False)
146 self.fakerootenv = self.getvar('FAKEROOTENV', metadata) 146 self.fakerootenv = self.getvar('FAKEROOTENV', metadata)
147 self.fakerootdirs = self.getvar('FAKEROOTDIRS', metadata) 147 self.fakerootdirs = self.getvar('FAKEROOTDIRS', metadata)
148 self.fakerootnoenv = self.getvar('FAKEROOTNOENV', metadata) 148 self.fakerootnoenv = self.getvar('FAKEROOTNOENV', metadata)