From 9538ee9191a1d3a2ebcf0f8d329509b43cec29c9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 21 Jan 2015 16:08:06 +0000 Subject: 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 --- bitbake/lib/bb/cooker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index a7560a17d0..f77c6c0532 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) -- cgit v1.2.3-54-g00ecf