diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-07-07 17:36:43 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 07:34:09 +0100 |
commit | 8acab25832176d1dfe4fca07c9f43b331d707f51 (patch) | |
tree | cf95aa61afe00cbe63c26c5ac3cc89d7f2d83c94 /bitbake/lib/bb/fetch2 | |
parent | 4c2f28bf482c2abda937b21217fc41d71f037166 (diff) | |
download | openembedded-core-contrib-8acab25832176d1dfe4fca07c9f43b331d707f51.tar.gz |
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 <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 4 |
1 files changed, 2 insertions, 2 deletions
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_" |