[oe-commits] [openembedded-core] 06/19: selftest/prservice.py: Sanitize package version when looking for stamp

[git at git.openembedded.org]

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

commit 1aefa6a4dec84a5581aab70451bb84801b3b3615
Author: Mariano Lopez <mariano.lopez at linux.intel.com>
AuthorDate: Thu Mar 10 10:29:21 2016 +0000

    selftest/prservice.py: Sanitize package version when looking for stamp
    
    Currently when using a git version the check for the stamp, using regex,
    will fail because of plus sign in the version.
    
    With this change the version is escaped before adding it to the regex.
    
    Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oeqa/selftest/prservice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/prservice.py b/meta/lib/oeqa/selftest/prservice.py
index 66638de..1b9a510 100644
--- a/meta/lib/oeqa/selftest/prservice.py
+++ b/meta/lib/oeqa/selftest/prservice.py
@@ -27,7 +27,7 @@ class BitbakePrTests(oeSelfTest):
         package_stamps_path = "/".join(stampdata[:-1])
         stamps = []
         for stamp in os.listdir(package_stamps_path):
-            find_stamp = re.match("%s\.%s\.([a-z0-9]{32})" % (prefix, recipe_task), stamp)
+            find_stamp = re.match("%s\.%s\.([a-z0-9]{32})" % (re.escape(prefix), recipe_task), stamp)
             if find_stamp:
                 stamps.append(find_stamp.group(1))
         self.assertFalse(len(stamps) == 0, msg="Cound not find stamp for task %s for recipe %s" % (recipe_task, package_name))

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