[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2512/8267] lib/oe/recipeutils: fix invalid character detection in validate_pn()



commit ce1904a1602de203293f901fe947d18105c5a1b0
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   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+")
    
    (From OE-Core rev: c5d5a1baf98a11676537fb5e9f8ec4409e30c1fd)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/recipeutils.py |    4 ++--
 1 files 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-'):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]