From 8491c2a5222dfa890c4ed922af02b6b4551a08c4 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 15 Jan 2013 13:22:47 -0700 Subject: license: correct re.search/fnmatch indentation This was causing it to only obey the last of the elements in INCOMPATIBLE_LICENSE. (From OE-Core rev: df4a4b9792e3bd13b396b94e232c69054fdf19b5) Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c8a8c639fa..cfb816d5a4 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 -- cgit v1.2.3-54-g00ecf