From e01c99ee4ac0dc7751b4e7a94103d3528ac970bf Mon Sep 17 00:00:00 2001 From: Sebastian Wiegand Date: Thu, 22 May 2014 12:24:16 +0200 Subject: distro_features_check.bbclass: fix searching whole list Search whole list of REQUIRED_DISTRO_FEATURES. Print only the missing/conflicting feature on error. (From OE-Core rev: 4290e10c17aa5477bbd57023c35426c12fcc25cb) Signed-off-by: Sebastian Wiegand Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/distro_features_check.bbclass | 6 +++--- 1 file 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) } -- cgit v1.2.3-54-g00ecf