diff options
Diffstat (limited to 'meta/classes/copyleft_filter.bbclass')
-rw-r--r-- | meta/classes/copyleft_filter.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/copyleft_filter.bbclass b/meta/classes/copyleft_filter.bbclass index 46be7f7d2f..426956f08f 100644 --- a/meta/classes/copyleft_filter.bbclass +++ b/meta/classes/copyleft_filter.bbclass | |||
@@ -49,7 +49,7 @@ def copyleft_should_include(d): | |||
49 | 49 | ||
50 | included, motive = False, 'recipe did not match anything' | 50 | included, motive = False, 'recipe did not match anything' |
51 | 51 | ||
52 | recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True) | 52 | recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE') |
53 | if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): | 53 | if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): |
54 | include, motive = False, 'recipe type "%s" is excluded' % recipe_type | 54 | include, motive = False, 'recipe type "%s" is excluded' % recipe_type |
55 | 55 | ||
@@ -57,9 +57,9 @@ def copyleft_should_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', True), 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', True), exc)) | 62 | bb.fatal('%s: %s' % (d.getVar('PF'), exc)) |
63 | else: | 63 | else: |
64 | if is_included: | 64 | if is_included: |
65 | if reason: | 65 | if reason: |
@@ -69,10 +69,10 @@ def copyleft_should_include(d): | |||
69 | else: | 69 | else: |
70 | included, motive = False, 'recipe has excluded licenses: %s' % ', '.join(reason) | 70 | included, motive = False, 'recipe has excluded licenses: %s' % ', '.join(reason) |
71 | 71 | ||
72 | if any(fnmatch(d.getVar('PN', True), 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)): |
74 | included, motive = True, 'recipe included by name' | 74 | included, motive = True, 'recipe included by name' |
75 | if any(fnmatch(d.getVar('PN', True), name) \ | 75 | if any(fnmatch(d.getVar('PN'), name) \ |
76 | for name in oe.data.typed_value('COPYLEFT_PN_EXCLUDE', d)): | 76 | for name in oe.data.typed_value('COPYLEFT_PN_EXCLUDE', d)): |
77 | included, motive = False, 'recipe excluded by name' | 77 | included, motive = False, 'recipe excluded by name' |
78 | 78 | ||