From 8acab25832176d1dfe4fca07c9f43b331d707f51 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Jul 2015 17:36:43 +0300 Subject: bitbake: wget.py: fix incorrect regexes [\.-_] means "any character between . and _" What was meant here is certainly "any character from the three characters .-_" (Bitbake rev: af13eaba627f199f91c048c435b9dbe19c79527f) Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/wget.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/fetch2/wget.py') diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 425b6b9a2a..bd2a8972a7 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -406,7 +406,7 @@ class Wget(FetchMethod): version_dir = ['', '', ''] version = ['', '', ''] - dirver_regex = re.compile("(\D*)((\d+[\.-_])+(\d+))") + dirver_regex = re.compile("(\D*)((\d+[\.\-_])+(\d+))") s = dirver_regex.search(dirver) if s: version_dir[1] = s.group(2) @@ -465,7 +465,7 @@ class Wget(FetchMethod): pn_regex = "(%s|%s|%s)" % (pn_prefix1, pn_prefix2, pn_prefix3) # match version - pver_regex = "(([A-Z]*\d+[a-zA-Z]*[\.-_]*)+)" + pver_regex = "(([A-Z]*\d+[a-zA-Z]*[\.\-_]*)+)" # match arch parch_regex = "-source|_all_" -- cgit v1.2.3-54-g00ecf