[oe-commits] [openembedded-core] 14/29: lib/oe/recipeutils: fix invalid character detection in validate_pn()

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit c5d5a1baf98a11676537fb5e9f8ec4409e30c1fd
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Mon Sep 19 08:08:12 2016 +1200

    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 at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/recipeutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index a0d78dd..58e4028 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-'):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.