diff options
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r-- | meta/classes/base.bbclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index bc9b236b84..e715ffa1b2 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -467,12 +467,15 @@ python () { | |||
467 | 467 | ||
468 | if bb.data.inherits_class('license', d): | 468 | if bb.data.inherits_class('license', d): |
469 | check_license_format(d) | 469 | check_license_format(d) |
470 | unmatched_license_flag = check_license_flags(d) | 470 | unmatched_license_flags = check_license_flags(d) |
471 | if unmatched_license_flag: | 471 | if unmatched_license_flags: |
472 | bb.debug(1, "Skipping %s because it has a restricted license not" | 472 | if len(unmatched_license_flags) == 1: |
473 | " whitelisted in LICENSE_FLAGS_WHITELIST" % pn) | 473 | message = "because it has a restricted license '{0}'. Which is not whitelisted in LICENSE_FLAGS_WHITELIST".format(unmatched_license_flags[0]) |
474 | raise bb.parse.SkipRecipe("because it has a restricted license not" | 474 | else: |
475 | " whitelisted in LICENSE_FLAGS_WHITELIST") | 475 | message = "because it has restricted licenses {0}. Which are not whitelisted in LICENSE_FLAGS_WHITELIST".format( |
476 | ", ".join("'{0}'".format(f) for f in unmatched_license_flags)) | ||
477 | bb.debug(1, "Skipping %s %s" % (pn, message)) | ||
478 | raise bb.parse.SkipRecipe(message) | ||
476 | 479 | ||
477 | # If we're building a target package we need to use fakeroot (pseudo) | 480 | # If we're building a target package we need to use fakeroot (pseudo) |
478 | # in order to capture permissions, owners, groups and special files | 481 | # in order to capture permissions, owners, groups and special files |