From: Christopher Larson <[email protected]> This was causing it to only obey the last of the elements in INCOMPATIBLE_LICENSE.
Signed-off-by: Christopher Larson <[email protected]> --- meta/classes/license.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c8a8c63..cfb816d 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -226,10 +226,10 @@ def incompatible_license(d, dont_want_licenses, package=None): # will exclude a trailing '+' character from LICENSE in # case INCOMPATIBLE_LICENSE is not a 'X+' license. lic = license - if not re.search('\+$', dwl): - lic = re.sub('\+', '', license) - if fnmatch(lic, dwl): - return False + if not re.search('\+$', dwl): + lic = re.sub('\+', '', license) + if fnmatch(lic, dwl): + return False return True # Handles an "or" or two license sets provided by -- 1.8.0.3 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
