Patchwork [2/6] license: correct re.search/fnmatch indentation

login
register
mail settings
Submitter Christopher Larson
Date Jan. 15, 2013, 8:22 p.m.
Message ID <ddbaa7bb90f623c4ee747697380a71aafa0e3e9a.1358281118.git.chris_larson@mentor.com>
Download mbox | patch
Permalink /patch/42673/
State Accepted
Commit df4a4b9792e3bd13b396b94e232c69054fdf19b5
Headers show

Comments

Christopher Larson - Jan. 15, 2013, 8:22 p.m.
From: Christopher Larson <chris_larson@mentor.com>

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

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta/classes/license.bbclass | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

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