diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/copyleft_filter.bbclass | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/meta/classes/copyleft_filter.bbclass b/meta/classes/copyleft_filter.bbclass index 5867bb9f7e..c36bce431a 100644 --- a/meta/classes/copyleft_filter.bbclass +++ b/meta/classes/copyleft_filter.bbclass | |||
@@ -47,27 +47,27 @@ def copyleft_should_include(d): | |||
47 | import oe.license | 47 | import oe.license |
48 | from fnmatch import fnmatchcase as fnmatch | 48 | from fnmatch import fnmatchcase as fnmatch |
49 | 49 | ||
50 | included, motive = False, 'recipe did not match anything' | ||
51 | |||
52 | recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE') | 50 | recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE') |
53 | if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): | 51 | if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): |
54 | include, motive = False, 'recipe type "%s" is excluded' % recipe_type | 52 | included, motive = False, 'recipe type "%s" is excluded' % recipe_type |
53 | else: | ||
54 | included, motive = False, 'recipe did not match anything' | ||
55 | 55 | ||
56 | include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) | 56 | include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) |
57 | exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) | 57 | exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) |
58 | 58 | ||
59 | try: | 59 | try: |
60 | is_included, reason = oe.license.is_included(d.getVar('LICENSE'), include, exclude) | 60 | is_included, reason = oe.license.is_included(d.getVar('LICENSE'), include, exclude) |
61 | except oe.license.LicenseError as exc: | 61 | except oe.license.LicenseError as exc: |
62 | bb.fatal('%s: %s' % (d.getVar('PF'), exc)) | 62 | bb.fatal('%s: %s' % (d.getVar('PF'), exc)) |
63 | else: | ||
64 | if is_included: | ||
65 | if reason: | ||
66 | included, motive = True, 'recipe has included licenses: %s' % ', '.join(reason) | ||
67 | else: | ||
68 | included, motive = False, 'recipe does not include a copyleft license' | ||
69 | else: | 63 | else: |
70 | included, motive = False, 'recipe has excluded licenses: %s' % ', '.join(reason) | 64 | if is_included: |
65 | if reason: | ||
66 | included, motive = True, 'recipe has included licenses: %s' % ', '.join(reason) | ||
67 | else: | ||
68 | included, motive = False, 'recipe does not include a copyleft license' | ||
69 | else: | ||
70 | included, motive = False, 'recipe has excluded licenses: %s' % ', '.join(reason) | ||
71 | 71 | ||
72 | if any(fnmatch(d.getVar('PN'), name) \ | 72 | if any(fnmatch(d.getVar('PN'), name) \ |
73 | for name in oe.data.typed_value('COPYLEFT_PN_INCLUDE', d)): | 73 | for name in oe.data.typed_value('COPYLEFT_PN_INCLUDE', d)): |