diff options
| -rw-r--r-- | meta/classes/distro_features_check.bbclass | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/meta/classes/distro_features_check.bbclass b/meta/classes/distro_features_check.bbclass index 9b78b03ef6..eeaa3b44cb 100644 --- a/meta/classes/distro_features_check.bbclass +++ b/meta/classes/distro_features_check.bbclass @@ -11,27 +11,22 @@ python () { # Assume at least one var is set. - distro_features = (d.getVar('DISTRO_FEATURES') or "").split() + distro_features = set((d.getVar('DISTRO_FEATURES') or '').split()) - any_of_distro_features = d.getVar('ANY_OF_DISTRO_FEATURES') + any_of_distro_features = set((d.getVar('ANY_OF_DISTRO_FEATURES') or '').split()) if any_of_distro_features: - any_of_distro_features = any_of_distro_features.split() - if set.isdisjoint(set(any_of_distro_features),set(distro_features)): - raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) + if set.isdisjoint(any_of_distro_features, distro_features): + raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % ' '.join(any_of_distro_features)) - required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') + required_distro_features = set((d.getVar('REQUIRED_DISTRO_FEATURES') or '').split()) if required_distro_features: - required_distro_features = required_distro_features.split() - for f in required_distro_features: - if f in distro_features: - continue - else: - raise bb.parse.SkipRecipe("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) + missing = set.difference(required_distro_features, distro_features) + if missing: + raise bb.parse.SkipRecipe("missing required distro feature%s '%s' (not in DISTRO_FEATURES)" % ('s' if len(missing) > 1 else '', ' '.join(missing))) - conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES') + conflict_distro_features = set((d.getVar('CONFLICT_DISTRO_FEATURES') or '').split()) if conflict_distro_features: - conflict_distro_features = conflict_distro_features.split() - for f in conflict_distro_features: - if f in distro_features: - raise bb.parse.SkipRecipe("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) + conflicts = set.intersection(conflict_distro_features, distro_features) + if conflicts: + raise bb.parse.SkipRecipe("conflicting distro feature%s '%s' (in DISTRO_FEATURES)" % ('s' if len(conflicts) > 1 else '', ' '.join(conflicts))) } |