diff options
| author |   Christopher Larson <chris_larson@mentor.com> | 2013-01-15 13:22:47 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-18 13:03:41 +0000 |
| commit | df4a4b9792e3bd13b396b94e232c69054fdf19b5 (patch) | |
| tree | 79dd34a36d0e10eb5c93b67b17239f6051e2563a /meta/classes/license.bbclass | |
| parent | 6a59b294b99b05e8973b5f2d60678988e90e2de3 (diff) | |
| download | openembedded-core-contrib-df4a4b9792e3bd13b396b94e232c69054fdf19b5.tar.gz | |
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>
Diffstat (limited to 'meta/classes/license.bbclass')
| -rw-r--r-- | meta/classes/license.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
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 |