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:48:13 +0000 |
| commit | 54d0ddd166a6707b4f8c8535639e3055b783363b (patch) | |
| tree | 85822a7812a35282ca88deb9c04e5fc8fcb539dc | |
| parent | 832a8523067606b180c02f0d1544e8a23219bb08 (diff) | |
| download | bitbake-54d0ddd166a6707b4f8c8535639e3055b783363b.tar.gz | |
cache: Don't try to expand __inherit_data
Trying to expand a variable which isn't a string doesn't make sense.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/cache.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index ab09b08b5..521f75828 100644 --- a/lib/bb/cache.py +++ b/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) |