aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wiegand <sebastian.wiegand@gersys.de>2014-05-22 12:24:16 +0200
committerSaul Wold <sgw@linux.intel.com>2014-05-23 10:45:08 -0700
commit4290e10c17aa5477bbd57023c35426c12fcc25cb (patch)
treef2de80091b5f1786366b0fa6f64e9a83b76325cd
parent7c40efb62f34f866c98a0b2df50d66c60d76143a (diff)
downloadopenembedded-core-contrib-4290e10c17aa5477bbd57023c35426c12fcc25cb.tar.gz
distro_features_check.bbclass: fix searching whole list
Search whole list of REQUIRED_DISTRO_FEATURES. Print only the missing/conflicting feature on error. Signed-off-by: Sebastian Wiegand <sebastian.wiegand@gersys.de> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/distro_features_check.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/distro_features_check.bbclass b/meta/classes/distro_features_check.bbclass
index 8a0ecb707e..1f1d6fba37 100644
--- a/meta/classes/distro_features_check.bbclass
+++ b/meta/classes/distro_features_check.bbclass
@@ -14,9 +14,9 @@ python () {
distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split()
for f in required_distro_features:
if f in distro_features:
- break
+ continue
else:
- raise bb.parse.SkipPackage("missing required distro feature %s (not in DISTRO_FEATURES)" % required_distro_features)
+ raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f)
conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True)
if conflict_distro_features:
@@ -24,5 +24,5 @@ python () {
distro_features = (d.getVar('DISTRO_FEATURES', True) or "").split()
for f in conflict_distro_features:
if f in distro_features:
- raise bb.parse.SkipPackage("conflicting distro feature %s (in DISTRO_FEATURES)" % conflict_distro_features)
+ raise bb.parse.SkipPackage("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f)
}