From: Christopher Larson <chris_larson@mentor.com>
Date: Tue, 15 Jan 2013 20:22:47 +0000 (-0700)
Subject: license: correct re.search/fnmatch indentation
X-Git-Tag: 2015-4~7989
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=df4a4b9792e3bd13b396b94e232c69054fdf19b5;p=openembedded-core.git

license: correct re.search/fnmatch indentation

This was causing it to only obey the last of the elements in
INCOMPATIBLE_LICENSE.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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