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:46 +0000 |
| commit | cc4c8478fc547ea0ebf827a8d319496b39f25684 (patch) | |
| tree | 6b188260c9ac6bd5a231cd1fbc99a58aaf3dfaa6 | |
| parent | 1a3c1c9203e1a1452314954f1cfd771e5c1ce89b (diff) | |
| download | bitbake-cc4c8478fc547ea0ebf827a8d319496b39f25684.tar.gz | |
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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/cooker.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index a7560a17d..f77c6c053 100644 --- a/lib/bb/cooker.py +++ b/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) |