diff options
Diffstat (limited to 'meta/classes-global/base.bbclass')
-rw-r--r-- | meta/classes-global/base.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index b6e339ed9c..976a2ddee4 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass | |||
@@ -516,12 +516,12 @@ python () { | |||
516 | check_license_format(d) | 516 | check_license_format(d) |
517 | unmatched_license_flags = check_license_flags(d) | 517 | unmatched_license_flags = check_license_flags(d) |
518 | if unmatched_license_flags: | 518 | if unmatched_license_flags: |
519 | if len(unmatched_license_flags) == 1: | 519 | for unmatched in unmatched_license_flags: |
520 | message = "because it has a restricted license '{0}'. Which is not listed in LICENSE_FLAGS_ACCEPTED".format(unmatched_license_flags[0]) | 520 | message = "Has a restricted license '%s' which is not listed in your LICENSE_FLAGS_ACCEPTED." % unmatched |
521 | else: | 521 | details = d.getVarFlag("LICENSE_FLAGS_DETAILS", unmatched) |
522 | message = "because it has restricted licenses {0}. Which are not listed in LICENSE_FLAGS_ACCEPTED".format( | 522 | if details: |
523 | ", ".join("'{0}'".format(f) for f in unmatched_license_flags)) | 523 | message += " For further details, see %s." % details |
524 | bb.debug(1, "Skipping %s %s" % (pn, message)) | 524 | bb.debug(1, "Skipping %s: %s" % (pn, message)) |
525 | raise bb.parse.SkipRecipe(message) | 525 | raise bb.parse.SkipRecipe(message) |
526 | 526 | ||
527 | # If we're building a target package we need to use fakeroot (pseudo) | 527 | # If we're building a target package we need to use fakeroot (pseudo) |