From: Mariano Lopez Date: Thu, 10 Mar 2016 10:29:21 +0000 (+0000) Subject: selftest/prservice.py: Sanitize package version when looking for stamp X-Git-Tag: 2016-4~489 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1aefa6a4dec84a5581aab70451bb84801b3b3615;p=openembedded-core.git 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 Signed-off-by: Ross Burton --- diff --git a/meta/lib/oeqa/selftest/prservice.py b/meta/lib/oeqa/selftest/prservice.py index 66638de8f8..1b9a510fd4 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))