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

login
register
mail settings
Submitter Jacob Kroon
Date May 22, 2014, 6:57 a.m.
Message ID <CAPbeDCmO-PZOr+8uohAQy5cQR4LPV+-3=048hhLWAijuU5cNWg@mail.gmail.com>
Download mbox | patch
Permalink /patch/72547/
State New
Headers show

Comments

Jacob Kroon - May 22, 2014, 6:57 a.m.
Hi,

On Wed, May 21, 2014 at 8:01 PM, Saul Wold <sgw@linux.intel.com> wrote:

> Richard,
>
> Another set of CVE fixes and some Updates.
>
> Thanks
>         Sau!
>
> The following changes since commit
> 7decf9dce56868e39902dac5957eb72f6e1e9acd:
>
>   cups: fix for cups not building without avahi (2014-05-21 09:08:11 +0100)
>
> are available in the git repository at:
>
>   git://git.openembedded.org/openembedded-core-contrib sgw/stage
>
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Chong Lu (3):
>   flex: Update to 2.5.39 version
>   byacc: Update to 20140422 version
>   guile: Update to 2.0.11 version
>
> Sebastian Wiegand (1):
>   distro_features_check.bbclass: fix wrong indentation
>
>
Doesn't this commit, 986db87a3931edce8be79f309d07497e4179a810, only check
that the first required distro feature found is available,  and skips
checking the remaining ?

Shouldnt we do something like this

     conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES', True)
     if conflict_distro_features:

/Jacob

Patch

diff --git a/meta/classes/distro_features_check.bbclass
b/meta/classes/distro_features_check.bbclass
index 61b11b7..b728bdc 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
-        else:
-            raise bb.parse.SkipPackage("missing required distro feature %s
(not in DISTRO_FEATURES)" % required_distro_features)
+                continue
+            else:
+                raise bb.parse.SkipPackage("missing required distro
feature %s (not in DISTRO_FEATURES)" % required_distro_features)