diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-10 09:54:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:55:07 +0000 |
| commit | 4c04ce0576f539ca71fcd69eb3739c150ae3b1c8 (patch) | |
| tree | 6200927d5c01288d66d8cda50c7d44e23fa68c1f /bitbake | |
| parent | 9d8e36a6c9663a1665ecefca59d172ad53f90ffe (diff) | |
| download | openembedded-core-contrib-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.py | 6 |
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): return out_dict @classmethod - def getvar(cls, var, metadata): - return metadata.getVar(var, True) or '' + def getvar(cls, var, metadata, expand = True): + return metadata.getVar(var, expand) or '' class CoreRecipeInfo(RecipeInfoCommon): @@ -142,7 +142,7 @@ class CoreRecipeInfo(RecipeInfoCommon): self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata) self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata) - self.inherits = self.getvar('__inherit_cache', metadata) + self.inherits = self.getvar('__inherit_cache', metadata, expand=False) self.fakerootenv = self.getvar('FAKEROOTENV', metadata) self.fakerootdirs = self.getvar('FAKEROOTDIRS', metadata) self.fakerootnoenv = self.getvar('FAKEROOTNOENV', metadata) |