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:28:05 +0000 |
| commit | 8491c2a5222dfa890c4ed922af02b6b4551a08c4 (patch) | |
| tree | 00e0fa4bc8af206d3295e93a3275e08643a9ae4a | |
| parent | feca9f7849422c9b0f529018a48148178e2673c9 (diff) | |
| download | ast2050-yocto-poky-8491c2a5222dfa890c4ed922af02b6b4551a08c4.zip ast2050-yocto-poky-8491c2a5222dfa890c4ed922af02b6b4551a08c4.tar.gz | |
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 <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 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 |
