diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-21 16:08:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:33:55 +0000 |
commit | 9538ee9191a1d3a2ebcf0f8d329509b43cec29c9 (patch) | |
tree | 898d9e41acf1d6cd93d1a1a6b6412b734fa7d49f /bitbake/lib | |
parent | 4eb3ffe5714b9beacc6a5f5373549aa640095983 (diff) | |
download | ast2050-yocto-poky-9538ee9191a1d3a2ebcf0f8d329509b43cec29c9.zip ast2050-yocto-poky-9538ee9191a1d3a2ebcf0f8d329509b43cec29c9.tar.gz |
bitbake: cooker: Use expanded_data for ASSUME_PROVIDED
Users expect operators like _remove to work on this variable. We need
to use expanded_data to ensure this happens correctly.
[YOCTO #7135]
(Bitbake rev: cc4c8478fc547ea0ebf827a8d319496b39f25684)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index a7560a1..f77c6c0 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -564,7 +564,7 @@ class BBCooker: fn = self.matchFile(fn) fn = bb.cache.Cache.realfn2virtual(fn, cls) elif len(pkgs_to_build) == 1: - ignore = self.data.getVar("ASSUME_PROVIDED", True) or "" + ignore = self.expanded_data.getVar("ASSUME_PROVIDED", True) or "" if pkgs_to_build[0] in set(ignore.split()): bb.fatal("%s is in ASSUME_PROVIDED" % pkgs_to_build[0]) @@ -1484,7 +1484,7 @@ class BBCooker: if len(pkgs_to_build) == 0: raise NothingToBuild - ignore = (self.data.getVar("ASSUME_PROVIDED", True) or "").split() + ignore = (self.expanded_data.getVar("ASSUME_PROVIDED", True) or "").split() for pkg in pkgs_to_build: if pkg in ignore: parselog.warn("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg) |