From patchwork Tue Jan 15 20:22:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/6] license: correct re.search/fnmatch indentation Date: Tue, 15 Jan 2013 20:22:47 -0000 From: Christopher Larson X-Patchwork-Id: 42673 Message-Id: To: openembedded-core@lists.openembedded.org Cc: Christopher Larson From: Christopher Larson This was causing it to only obey the last of the elements in INCOMPATIBLE_LICENSE. Signed-off-by: Christopher Larson --- 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