Patchwork [1/2] license.py: fix behaviour of copyleft_compliance

login
register
mail settings
Submitter Eric BENARD
Date April 2, 2012, 8:37 p.m.
Message ID <1333399030-28619-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/25087/
State Accepted
Commit 987d06447d2eacf2e01f08e29469c00fbb0ef1db
Headers show

Comments

Eric BENARD - April 2, 2012, 8:37 p.m.
actually if a package has a license in its LICENSE variable
which is not in the whitelist nor in the blacklist and even
if an other license in this variable is in the whitelist,
the package gets excluded and is not taken in account in the
copyleft_compliance.
This patch solves this by excluding a recipe _only_ if the
LICENSE variable includes a pattern from the blacklist and
including a recipe only if it includes a variable from the
whitelist _and_ none from the blacklist.

Example in busybox which has LICENSE="GPLv2 & BSD-4-Clause",
with the actual behaviour (where he blacklist contains only
CLOSED Proprietary) we get :
DEBUG: copyleft: busybox-1.19.4 is excluded: recipe has excluded licenses: BSD-4-Clause
which is not sane because busybox is covered by a copyleft license
which is GPLv2 and should match the default whitelist which is
GPL* LGPL*.

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
v2: updated and tested after Kergoth's review on IRC

 meta/lib/oe/license.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
Saul Wold - April 4, 2012, 4:54 p.m.
On 04/02/2012 01:37 PM, Eric Bénard wrote:
> actually if a package has a license in its LICENSE variable
> which is not in the whitelist nor in the blacklist and even
> if an other license in this variable is in the whitelist,
> the package gets excluded and is not taken in account in the
> copyleft_compliance.
> This patch solves this by excluding a recipe _only_ if the
> LICENSE variable includes a pattern from the blacklist and
> including a recipe only if it includes a variable from the
> whitelist _and_ none from the blacklist.
>
> Example in busybox which has LICENSE="GPLv2&  BSD-4-Clause",
> with the actual behaviour (where he blacklist contains only
> CLOSED Proprietary) we get :
> DEBUG: copyleft: busybox-1.19.4 is excluded: recipe has excluded licenses: BSD-4-Clause
> which is not sane because busybox is covered by a copyleft license
> which is GPLv2 and should match the default whitelist which is
> GPL* LGPL*.
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
> ---
> v2: updated and tested after Kergoth's review on IRC
>
>   meta/lib/oe/license.py |   11 +++++++----
>   1 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
> index 5914506..173e319 100644
> --- a/meta/lib/oe/license.py
> +++ b/meta/lib/oe/license.py
> @@ -86,8 +86,10 @@ def is_included(licensestr, whitelist=None, blacklist=None):
>       """
>
>       def include_license(license):
> -        return (any(fnmatch(license, pattern) for pattern in whitelist) and not
> -                any(fnmatch(license, pattern) for pattern in blacklist))
> +        return any(fnmatch(license, pattern) for pattern in whitelist)
> +
> +    def exclude_license(license):
> +        return any(fnmatch(license, pattern) for pattern in blacklist)
>
>       def choose_licenses(alpha, beta):
>           """Select the option in an OR which is the 'best' (has the most
> @@ -106,8 +108,9 @@ def is_included(licensestr, whitelist=None, blacklist=None):
>           blacklist = []
>
>       licenses = flattened_licenses(licensestr, choose_licenses)
> -    excluded = filter(lambda lic: not include_license(lic), licenses)
> +    excluded = filter(lambda lic: exclude_license(lic), licenses)
> +    included = filter(lambda lic: include_license(lic), licenses)
>       if excluded:
>           return False, excluded
>       else:
> -        return True, None
> +        return True, included

Merged both of these into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py
index 5914506..173e319 100644
--- a/meta/lib/oe/license.py
+++ b/meta/lib/oe/license.py
@@ -86,8 +86,10 @@  def is_included(licensestr, whitelist=None, blacklist=None):
     """
 
     def include_license(license):
-        return (any(fnmatch(license, pattern) for pattern in whitelist) and not
-                any(fnmatch(license, pattern) for pattern in blacklist))
+        return any(fnmatch(license, pattern) for pattern in whitelist)
+
+    def exclude_license(license):
+        return any(fnmatch(license, pattern) for pattern in blacklist)
 
     def choose_licenses(alpha, beta):
         """Select the option in an OR which is the 'best' (has the most
@@ -106,8 +108,9 @@  def is_included(licensestr, whitelist=None, blacklist=None):
         blacklist = []
 
     licenses = flattened_licenses(licensestr, choose_licenses)
-    excluded = filter(lambda lic: not include_license(lic), licenses)
+    excluded = filter(lambda lic: exclude_license(lic), licenses)
+    included = filter(lambda lic: include_license(lic), licenses)
     if excluded:
         return False, excluded
     else:
-        return True, None
+        return True, included