From e62965346314544919e4a529ca860a242d76b303 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Thu, 24 Feb 2022 13:55:33 -0800 Subject: license.py: rename variables Update the comment to reflect new variable names (From OE-Core rev: 7fbab1aefc127f0e1834f51a8a793b0d7e7b4f07) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/lib/oe/license.py | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) (limited to 'meta/lib/oe/license.py') diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index b5d378a549..b1105f6149 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py @@ -99,26 +99,29 @@ def flattened_licenses(licensestr, choose_licenses): raise LicenseSyntaxError(licensestr, exc) return flatten.licenses -def is_included(licensestr, whitelist=None, blacklist=None): - """Given a license string and whitelist and blacklist, determine if the - license string matches the whitelist and does not match the blacklist. - - Returns a tuple holding the boolean state and a list of the applicable - licenses that were excluded if state is False, or the licenses that were - included if the state is True. +def is_included(licensestr, include_licenses=None, exclude_licenses=None): + """Given a license a list of list to include and a list of + licenses to exclude, determine if the license string + matches the an include list and does not match the + exclude list. + + Returns a tuple holding the boolean state and a list of + the applicable licenses that were excluded if state is + False, or the licenses that were included if the state + is True. """ def include_license(license): - return any(fnmatch(license, pattern) for pattern in whitelist) + return any(fnmatch(license, pattern) for pattern in include_licenses) def exclude_license(license): - return any(fnmatch(license, pattern) for pattern in blacklist) + return any(fnmatch(license, pattern) for pattern in exclude_licenses) def choose_licenses(alpha, beta): """Select the option in an OR which is the 'best' (has the most included licenses and no excluded licenses).""" # The factor 1000 below is arbitrary, just expected to be much larger - # that the number of licenses actually specified. That way the weight + # than the number of licenses actually specified. That way the weight # will be negative if the list of licenses contains an excluded license, # but still gives a higher weight to the list with the most included # licenses. @@ -131,11 +134,11 @@ def is_included(licensestr, whitelist=None, blacklist=None): else: return beta - if not whitelist: - whitelist = ['*'] + if not include_licenses: + include = ['*'] - if not blacklist: - blacklist = [] + if not exclude_licenses: + exclude = [] licenses = flattened_licenses(licensestr, choose_licenses) excluded = [lic for lic in licenses if exclude_license(lic)] -- cgit v1.2.3-54-g00ecf