From 8146e929e2643afad18da09b4f1b16b894503674 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Jan 2018 11:31:14 +0000 Subject: classes/recipes: Convert SkipPackage -> SkipRecipe The new name is much more consistent with what this actually means. We put the pieces in place to rename everything a while back but looks like we forgot to actually do it! Fix that now. (From OE-Core rev: af9612f5d6b848fceea22d10ee964437299be776) Signed-off-by: Richard Purdie --- meta/classes/distro_features_check.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/classes/distro_features_check.bbclass') diff --git a/meta/classes/distro_features_check.bbclass b/meta/classes/distro_features_check.bbclass index e74d3c04ba..9b78b03ef6 100644 --- a/meta/classes/distro_features_check.bbclass +++ b/meta/classes/distro_features_check.bbclass @@ -17,7 +17,7 @@ python () { 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.SkipPackage("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) + raise bb.parse.SkipRecipe("one of '%s' needs to be in DISTRO_FEATURES" % any_of_distro_features) required_distro_features = d.getVar('REQUIRED_DISTRO_FEATURES') if required_distro_features: @@ -26,12 +26,12 @@ python () { if f in distro_features: continue else: - raise bb.parse.SkipPackage("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) + raise bb.parse.SkipRecipe("missing required distro feature '%s' (not in DISTRO_FEATURES)" % f) conflict_distro_features = d.getVar('CONFLICT_DISTRO_FEATURES') 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.SkipPackage("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) + raise bb.parse.SkipRecipe("conflicting distro feature '%s' (in DISTRO_FEATURES)" % f) } -- cgit v1.2.3-54-g00ecf