diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-01-18 15:51:32 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-20 21:36:59 +0000 |
| commit | 297f2a7afc6550f5519e54dd3101f404372f6646 (patch) | |
| tree | f26ccff46ac487fe23bb59830cb99e1fb1e8c5ac /meta | |
| parent | 238c13f10603e3566cbdd79ecc4c358aa9ab9fcc (diff) | |
| download | poky-297f2a7afc6550f5519e54dd3101f404372f6646.tar.gz | |
base.bbclass: fix parse error on recipes with '++' in their name
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>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 f1ffb4540a..583f9b775f 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -422,7 +422,8 @@ python () { | |||
| 422 | 422 | ||
| 423 | commercial_license = bb.data.getVar('COMMERCIAL_LICENSE', d, 1) | 423 | commercial_license = bb.data.getVar('COMMERCIAL_LICENSE', d, 1) |
| 424 | import re | 424 | import re |
| 425 | if commercial_license and re.search(pn, commercial_license): | 425 | pnr = pn.replace('+', "\+") |
| 426 | if commercial_license and re.search(pnr, commercial_license): | ||
| 426 | bb.debug(1, "Skipping %s because it's commercially licensed" % pn) | 427 | bb.debug(1, "Skipping %s because it's commercially licensed" % pn) |
| 427 | raise bb.parse.SkipPackage("because it requires commercial license to ship product") | 428 | raise bb.parse.SkipPackage("because it requires commercial license to ship product") |
| 428 | 429 | ||