Patchwork [5/5] license.bbclass: Fixing LICENSE modifiers.

login
register
mail settings
Submitter Elizabeth Flanagan
Date May 25, 2011, 11:30 p.m.
Message ID <4DDD912E.6060503@intel.com>
Download mbox | patch
Permalink /patch/4787/
State New, archived
Headers show

Comments

Elizabeth Flanagan - May 25, 2011, 11:30 p.m.
I support two license type modifiers. + meaning "or greater"
and * meaning "with exceptions" for licenses that don't have
a generic "with exceptions" (as some do).

For now, I'm stripping them out and doing the base generic

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
---
  meta/classes/license.bbclass |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6a2998a..c20be98 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -64,7 +64,13 @@  python do_populate_lic() {
              ast.NodeVisitor.generic_visit(self, node)

          def visit_Str(self, node):
-            find_license(node.s)
+            #
+            # Until I figure out what to do with
+            # the two modifiers I support (or greater = +
+            # and "with exceptions" being *
+            # we'll just strip out the modifier and put
+            # the base license.
+            find_license(node.s.replace("+", "").replace("*", ""))
              ast.NodeVisitor.generic_visit(self, node)

          def visit_BinOp(self, node):