summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-16 16:01:19 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-19 08:06:10 +1200
commit89d68923d93f02e598929c552d5c5f6d9b607c2c (patch)
tree4128fc0d9601c92babba41c19259f3add5534502
parent8f62c47d9577bb2a9fcafb0759fa2ae1d0632d79 (diff)
downloadopenembedded-core-contrib-89d68923d93f02e598929c552d5c5f6d9b607c2c.tar.gz
openembedded-core-contrib-89d68923d93f02e598929c552d5c5f6d9b607c2c.tar.bz2
openembedded-core-contrib-89d68923d93f02e598929c552d5c5f6d9b607c2c.zip
lib/oe/recipeutils: fix invalid character detection in validate_pn()
* validate_pn() is supposed to protect against invalid characters, fix the function so that it actually does (unanchored regex strikes again...) * However, now that the function is enforcing the restrictions, we do still want to allow + in recipe names (e.g. "gtk+") Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/lib/oe/recipeutils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index a0d78dde46..58e4028aed 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -449,8 +449,8 @@ def get_recipe_patched_files(d):
def validate_pn(pn):
"""Perform validation on a recipe name (PN) for a new recipe."""
reserved_names = ['forcevariable', 'append', 'prepend', 'remove']
- if not re.match('[0-9a-z-.]+', pn):
- return 'Recipe name "%s" is invalid: only characters 0-9, a-z, - and . are allowed' % pn
+ if not re.match('^[0-9a-z-.+]+$', pn):
+ return 'Recipe name "%s" is invalid: only characters 0-9, a-z, -, + and . are allowed' % pn
elif pn in reserved_names:
return 'Recipe name "%s" is invalid: is a reserved keyword' % pn
elif pn.startswith('pn-'):