From 41125ddc8651494ffcf888d3b5efce1ae6d953bb Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 6 Nov 2012 20:18:42 +0800 Subject: [PATCH] bitbake: print clear message for "bitbake -e ASSUME_PROVIDED" "bitbake -e ASSUME_PROVIDED" should fail, but the error message wasn't clear enough in the past: $ bitbake -e bzip2-native [snip] ERROR: Command execution failed: Traceback (most recent call last): File "/buildarea/lyang1/poky/bitbake/lib/bb/command.py", line 94, in runAsyncCommand commandmethod(self.cmds_async, self, options) File "/buildarea/lyang1/poky/bitbake/lib/bb/command.py", line 323, in showEnvironmentTarget command.cooker.showEnvironment(None, pkg) File "/buildarea/lyang1/poky/bitbake/lib/bb/cooker.py", line 325, in showEnvironment fnid = taskdata.build_targets[targetid][0] KeyError: 0 [snip] With this patch, the massage will be: [snip] ERROR: bzip2-native is in ASSUME_PROVIDED ERROR: Command execution failed: Exited with 1 Summary: There were 2 ERROR messages shown, returning a non-zero exit code. [YOCTO #3392] (Bitbake rev: f31447dac92454c822d4ebb7dd48e96c6c69dde4) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index e299059401..5f88f1ff59 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -313,6 +313,10 @@ class BBCooker: elif len(pkgs_to_build) == 1: self.updateCache() + ignore = self.configuration.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]) + localdata = data.createCopy(self.configuration.data) bb.data.update_data(localdata) bb.data.expandKeys(localdata)