mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: fetch2: wget remove scape of - in regexes don't needed

Browse Source 
(Bitbake rev: 8fa43245351f3ec0a5007b2742c08b7ef98e7879)

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Aníbal Limón
2015-02-13 15:58:13 -06:00
committed by Richard Purdie
parent 5a88664b22
commit 1c1d9e3beb
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bitbake/lib/bb/fetch2/wget.py
View File

@@ -141,7 +141,7 @@ class Wget(FetchMethod):
else: else:
version = version[1:len(version)] version = version[1:len(version)]
version = re.sub('\-', '.', version) version = re.sub('-', '.', version)
version = re.sub('_', '.', version) version = re.sub('_', '.', version)
version = re.sub('(rc)+', '.1000.', version) version = re.sub('(rc)+', '.1000.', version)
version = re.sub('(beta)+', '.100.', version) version = re.sub('(beta)+', '.100.', version)
@@ -246,7 +246,7 @@ class Wget(FetchMethod):
version_dir = ['', '', ''] version_dir = ['', '', '']
version = ['', '', ''] version = ['', '', '']
dirver_regex = re.compile("(\D*)((\d+[\.\-_])+(\d+))") dirver_regex = re.compile("(\D*)((\d+[\.-_])+(\d+))")
s = dirver_regex.search(dirver) s = dirver_regex.search(dirver)
if s: if s:
version_dir[1] = s.group(2) version_dir[1] = s.group(2)
@@ -296,26 +296,26 @@ class Wget(FetchMethod):
gst-fluendo-mp3 gst-fluendo-mp3
""" """
# match most patterns which uses "-" as separator to version digits # match most patterns which uses "-" as separator to version digits
pn_prefix1 = "[a-zA-Z][a-zA-Z0-9]*([\-_][a-zA-Z]\w+)*\+?[\-_]" pn_prefix1 = "[a-zA-Z][a-zA-Z0-9]*([-_][a-zA-Z]\w+)*\+?[-_]"
# a loose pattern such as for unzip552.tar.gz # a loose pattern such as for unzip552.tar.gz
pn_prefix2 = "[a-zA-Z]+" pn_prefix2 = "[a-zA-Z]+"
# a loose pattern such as for 80325-quicky-0.4.tar.gz # a loose pattern such as for 80325-quicky-0.4.tar.gz
pn_prefix3 = "[0-9]+[\-]?[a-zA-Z]+" pn_prefix3 = "[0-9]+[-]?[a-zA-Z]+"
# Save the Package Name (pn) Regex for use later # Save the Package Name (pn) Regex for use later
pn_regex = "(%s|%s|%s)" % (pn_prefix1, pn_prefix2, pn_prefix3) pn_regex = "(%s|%s|%s)" % (pn_prefix1, pn_prefix2, pn_prefix3)
# match version # match version
pver_regex = "(([A-Z]*\d+[a-zA-Z]*[\.\-_]*)+)" pver_regex = "(([A-Z]*\d+[a-zA-Z]*[\.-_]*)+)"
# match arch # match arch
parch_regex = "\-source|_all_" parch_regex = "-source|_all_"
# src.rpm extension was added only for rpm package. Can be removed if the rpm # src.rpm extension was added only for rpm package. Can be removed if the rpm
# packaged will always be considered as having to be manually upgraded # packaged will always be considered as having to be manually upgraded
psuffix_regex = "(tar\.gz|tgz|tar\.bz2|zip|xz|rpm|bz2|orig\.tar\.gz|tar\.xz|src\.tar\.gz|src\.tgz|svnr\d+\.tar\.bz2|stable\.tar\.gz|src\.rpm)" psuffix_regex = "(tar\.gz|tgz|tar\.bz2|zip|xz|rpm|bz2|orig\.tar\.gz|tar\.xz|src\.tar\.gz|src\.tgz|svnr\d+\.tar\.bz2|stable\.tar\.gz|src\.rpm)"
# match name, version and archive type of a package # match name, version and archive type of a package
package_regex_comp = re.compile("(?P<name>%s?\.?v?)(?P<pver>%s)(?P<arch>%s)?[\.\-](?P<type>%s$)" package_regex_comp = re.compile("(?P<name>%s?\.?v?)(?P<pver>%s)(?P<arch>%s)?[\.-](?P<type>%s$)"
% (pn_regex, pver_regex, parch_regex, psuffix_regex)) % (pn_regex, pver_regex, parch_regex, psuffix_regex))
self.suffix_regex_comp = re.compile(psuffix_regex) self.suffix_regex_comp = re.compile(psuffix_regex)
@@ -327,7 +327,7 @@ class Wget(FetchMethod):
version = self._parse_path(package_regex_comp, package) version = self._parse_path(package_regex_comp, package)
if version: if version:
package_custom_regex_comp = re.compile( package_custom_regex_comp = re.compile(
"(?P<name>%s)(?P<pver>%s)(?P<arch>%s)?[\.\-](?P<type>%s)" % "(?P<name>%s)(?P<pver>%s)(?P<arch>%s)?[\.-](?P<type>%s)" %
(re.escape(version[0]), pver_regex, parch_regex, psuffix_regex)) (re.escape(version[0]), pver_regex, parch_regex, psuffix_regex))
else: else:
package_custom_regex_comp = None package_custom_regex_comp = None
@@ -362,7 +362,7 @@ class Wget(FetchMethod):
# search for version matches on folders inside the path, like: # search for version matches on folders inside the path, like:
# "5.7" in http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz # "5.7" in http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz
dirver_regex = re.compile("(?P<dirver>[^/]*(\d+\.)*\d+([\-_]r\d+)*)/") dirver_regex = re.compile("(?P<dirver>[^/]*(\d+\.)*\d+([-_]r\d+)*)/")
m = dirver_regex.search(path) m = dirver_regex.search(path)
if m: if m:
pn = d.getVar('PN', True) pn = d.getVar('PN', True)