From 401c56258753a96c0a4e3e91a11518f182d410ff Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 15 Feb 2022 23:09:43 +0000 Subject: features_check/insane: Use hasOverrides datastore method Signed-off-by: Richard Purdie --- meta/classes/features_check.bbclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/classes/features_check.bbclass') diff --git a/meta/classes/features_check.bbclass b/meta/classes/features_check.bbclass index 205e1b9cd3..3ef6b35baa 100644 --- a/meta/classes/features_check.bbclass +++ b/meta/classes/features_check.bbclass @@ -19,12 +19,9 @@ python () { unused = True for kind in ['DISTRO', 'MACHINE', 'COMBINED', 'IMAGE']: - if d.getVar('ANY_OF_' + kind + '_FEATURES') is None and \ - d.overridedata.get('ANY_OF_' + kind + '_FEATURES') is None and \ - d.getVar('REQUIRED_' + kind + '_FEATURES') is None and \ - d.overridedata.get('REQUIRED_' + kind + '_FEATURES') is None and \ - d.getVar('CONFLICT_' + kind + '_FEATURES') is None and \ - d.overridedata.get('CONFLICT_' + kind + '_FEATURES') is None: + if d.getVar('ANY_OF_' + kind + '_FEATURES') is None and not d.hasOverrides('ANY_OF_' + kind + '_FEATURES') and \ + d.getVar('REQUIRED_' + kind + '_FEATURES') is None and not d.hasOverrides('REQUIRED_' + kind + '_FEATURES') and \ + d.getVar('CONFLICT_' + kind + '_FEATURES') is None and not d.hasOverrides('CONFLICT_' + kind + '_FEATURES'): continue unused = False -- cgit 1.2.3-korg