[poky] [PATCH] base.bbclass: fix parse error on recipes with '++' in their name

Paul Eggleton paul.eggleton at linux.intel.com
Tue Jan 18 07:51:32 PST 2011


Fixes "multiple repeat" or "nothing to repeat" errors when parsing recipes
with '++' in the file name.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
 meta/classes/base.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f1ffb45..583f9b7 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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")
 
-- 
1.7.3.1




More information about the poky mailing list