From 9ce92e439f2995b8e201461a0f76910b0b9a12f9 Mon Sep 17 00:00:00 2001 From: Eric Bénard Date: Mon, 2 Apr 2012 22:37:10 +0200 Subject: copyleft_compliance: also print the reason for including a package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (From OE-Core rev: 20996da46aff03e61de50444ab3a0ab46c057dfd) Signed-off-by: Eric Bénard Signed-off-by: Richard Purdie --- meta/classes/copyleft_compliance.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/classes/copyleft_compliance.bbclass') diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass index 4082e7e15d..3ca7337b55 100644 --- a/meta/classes/copyleft_compliance.bbclass +++ b/meta/classes/copyleft_compliance.bbclass @@ -47,14 +47,14 @@ def copyleft_should_include(d): exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) try: - is_included, excluded = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) + is_included, reason = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) except oe.license.LicenseError as exc: bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) else: if is_included: - return True, None + return True, 'recipe has included licenses: %s' % ', '.join(reason) else: - return False, 'recipe has excluded licenses: %s' % ', '.join(excluded) + return False, 'recipe has excluded licenses: %s' % ', '.join(reason) python do_prepare_copyleft_sources () { """Populate a tree of the recipe sources and emit patch series files""" @@ -67,7 +67,7 @@ python do_prepare_copyleft_sources () { bb.debug(1, 'copyleft: %s is excluded: %s' % (p, reason)) return else: - bb.debug(1, 'copyleft: %s is included' % p) + bb.debug(1, 'copyleft: %s is included: %s' % (p, reason)) sources_dir = d.getVar('COPYLEFT_SOURCES_DIR', True) src_uri = d.getVar('SRC_URI', True).split() -- cgit v1.2.3-54-g00ecf