]> code.ossystems Code Review - openembedded-core.git/commitdiff
base.bbclass: fix parse error on recipes with '++' in their name
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Tue, 18 Jan 2011 15:51:32 +0000 (15:51 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 20 Jan 2011 21:36:59 +0000 (21:36 +0000)
Fixes "multiple repeat" or "nothing to repeat" errors when parsing recipes
with '++' in the file name.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/classes/base.bbclass

index f1ffb4540a236494c74b86f206ed1302c084ee0e..583f9b775fc6c8b695583682a450b6924eafb8a5 100644 (file)
@@ -422,7 +422,8 @@ python () {
 
     commercial_license = bb.data.getVar('COMMERCIAL_LICENSE', d, 1)
     import re
-    if commercial_license and re.search(pn, commercial_license):
+    pnr = pn.replace('+', "\+")
+    if commercial_license and re.search(pnr, commercial_license):
         bb.debug(1, "Skipping %s because it's commercially licensed" % pn)
         raise bb.parse.SkipPackage("because it requires commercial license to ship product")