diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-22 21:23:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-07-22 21:25:55 +0100 |
commit | f31d7d0ad57b0ecc2ae06ed4b547c98df2aaa1a5 (patch) | |
tree | c3c5f273346ea15f24521961d9f063cbb3e54f7a /lib | |
parent | 883d926120833c85a16dcf60425dd7af7699046a (diff) | |
download | bitbake-f31d7d0ad57b0ecc2ae06ed4b547c98df2aaa1a5.tar.gz |
cooker: Improve multiconfig configuration error reporting
This avoids a traceback if an invalid multiconfig is referenced in the bitbake
commandline and tweaks the message to make it more understanable.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bb/cooker.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 3a58a3a33..19ddc1d3b 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -626,6 +626,7 @@ class BBCooker: current = 0 runlist = [] for k in fulltargetlist: + origk = k mc = "" if k.startswith("mc:"): mc = k.split(":")[1] @@ -635,6 +636,10 @@ class BBCooker: k2 = k.split(":do_") k = k2[0] ktask = k2[1] + + if mc not in self.multiconfigs: + bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named %s" % (origk, mc)) + taskdata[mc].add_provider(localdata[mc], self.recipecaches[mc], k) current += 1 if not ktask.startswith("do_"): @@ -670,7 +675,7 @@ class BBCooker: l = k.split(':') depmc = l[2] if depmc not in self.multiconfigs: - bb.fatal("Multiconfig dependency %s depends on nonexistent mc configuration %s" % (k,depmc)) + bb.fatal("Multiconfig dependency %s depends on nonexistent multiconfig configuration named configuration %s" % (k,depmc)) else: logger.debug(1, "Adding providers for multiconfig dependency %s" % l[3]) taskdata[depmc].add_provider(localdata[depmc], self.recipecaches[depmc], l[3]) |