Patchwork [CONSOLIDATED,PULL,00/16] CVE Patches and updates

login
register
mail settings
Submitter Sebastian Wiegand
Date May 22, 2014, 10:34 a.m.
Message ID <537DD2A2.6000001@gersys.de>
Download mbox | patch
Permalink /patch/72579/
State New
Headers show

Comments

Sebastian Wiegand - May 22, 2014, 10:34 a.m.
On Thursday, 22.05.2014 12:10 +0200, Burton, Ross 
<ross.burton@intel.com> wrote:
> On 22 May 2014 10:58, Sebastian Wiegand <sebastian.wiegand@gersys.de> wrote:
>> Reworked and fixed the error message, too.
> Can you send this patch using e.g. git format-patch so the commit
> message is correct, and add a signed-off-by.
>
> Ross
From: Sebastian Wiegand <sebastian.wiegand@gersys.de>
Date: Thu, 22 May 2014 12:24:16 +0200
Subject: [PATCH] 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>
---
  meta/classes/distro_features_check.bbclass |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)


      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)
  }

Patch

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)