[oe-commits] [meta-openembedded] 09/16: ostree: Fix DISTRO_FEATURES with ptest but w/o xattr

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit f6df0263f768108db5c5b8c098ef0d4c699841a4
Author: Alex Kiernan <alex.kiernan at gmail.com>
AuthorDate: Mon Dec 2 19:33:39 2019 +0000

    ostree: Fix DISTRO_FEATURES with ptest but w/o xattr
    
    Fix the test for PTEST_ENABLED so it only fires when it's actually enabled, as
    opposed to everytime. This allows the tautological test for native to be
    removed as PTEST_ENABLED isn't set there.
    
    Signed-off-by: Alex Kiernan <alex.kiernan at gmail.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-extended/ostree/ostree_2019.5.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
index b3b34a1..b2bfaaf 100644
--- a/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
+++ b/meta-oe/recipes-extended/ostree/ostree_2019.5.bb
@@ -182,8 +182,8 @@ SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service"
 BBCLASSEXTEND = "native"
 
 python __anonymous() {
-    if not bb.data.inherits_class('native', d) and bb.utils.contains('PTEST_ENABLED', '1', 'True', 'False', d):
-        if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', 'False', d):
+    if bb.utils.contains('PTEST_ENABLED', '1', 'True', '', d):
+        if not bb.utils.contains_any('BBFILE_COLLECTIONS', 'meta-python', 'True', '', d):
             raise bb.parse.SkipRecipe('ptest requires meta-python to be present.')
         elif not bb.utils.contains_any('PACKAGECONFIG', 'soup curl', 'True', 'False', d):
             raise bb.parse.SkipRecipe('ptest requires soup enabled in PACKAGECONFIG.')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.