[oe-commits] Sebastian Wiegand : distro_features_check.bbclass: fix searching whole list

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 4290e10c17aa5477bbd57023c35426c12fcc25cb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4290e10c17aa5477bbd57023c35426c12fcc25cb

Author: Sebastian Wiegand <sebastian.wiegand at gersys.de>
Date:   Thu May 22 12:24:16 2014 +0200

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 at gersys.de>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 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 8a0ecb7..1f1d6fb 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)
 }