sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: fetch/wget: _init_regexes rename variables to be more consistent and move dirver_regex into it 

(Bitbake rev: 583e5d9c1c3cb8a25d34648078200faadc597e9c)

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 2014-11-27 19:12:02 -06:00 committed by Richard Purdie
parent 35b7089b34
commit a7bdd0eb29
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ class Wget(FetchMethod):
Check for a new suffix type that we have never heard of before
"""
if (newsuffix):
m = self.suffixregex.search(newsuffix)
m = self.suffix_regex_comp.search(newsuffix)
if not m:
bb.warn("%s has a possible unknown suffix: %s" % (newpn, newsuffix))
return False
@ -233,7 +233,7 @@ class Wget(FetchMethod):
If error or no version, return ""
"""
valid = 0
version = self._parse_path(self.name_version_type_regex, packagename)
version = self._parse_path(self.package_regex_comp, packagename)
bb.debug(3, "VersionURL: %s" % (url))
soup = BeautifulSoup(self._fetch_index(url, ud, d))
@ -258,7 +258,7 @@ class Wget(FetchMethod):
else:
continue
else:
newver = self._parse_path(self.name_version_type_regex, line['href'])
newver = self._parse_path(self.package_regex_comp, line['href'])
valid = 1
if newver and self._vercmp(version, newver) == True:
version = newver
@ -294,18 +294,26 @@ class Wget(FetchMethod):
# a loose pattern such as for 80325-quicky-0.4.tar.gz
pn_prefix3 = "[0-9]+[\-]?[a-zA-Z]+"
# Save the Package Name (pn) Regex for use later
self.pn_regex = "(%s|%s|%s)" % (pn_prefix1, pn_prefix2, pn_prefix3)
pn_regex = "(%s|%s|%s)" % (pn_prefix1, pn_prefix2, pn_prefix3)
# match version
version_regex = "(([A-Z]*\d+[a-zA-Z]*[\.\-_]*)+)"
pver_regex = "(([A-Z]*\d+[a-zA-Z]*[\.\-_]*)+)"
# match arch
parch_regex = "\-source|_all_"
# 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
suffixlist = "(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)"
self.suffixregex = re.compile(suffixlist)
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
self.name_version_type_regex = re.compile("(?P<name>%s?)\.?v?(?P<ver>%s)(\-source)?[\.\-](?P<type>%s$)" % (self.pn_regex, version_regex, suffixlist))
self.package_regex_comp = re.compile("(?P<name>%s?)\.?v?(?P<ver>%s)(?P<arch>%s)?[\.\-](?P<type>%s$)"
% (pn_regex, pver_regex, parch_regex, psuffix_regex))
self.suffix_regex_comp = re.compile(psuffix_regex)
# 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
self.dirver_regex_comp = re.compile("(?P<dirver>[^/]*(\d+\.)*\d+([\-_]r\d+)*)/")
def latest_versionstring(self, ud, d):
"""
@ -319,11 +327,9 @@ class Wget(FetchMethod):
self._init_regexes()
# 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
m = re.search("(?P<dirver>[^/]*(\d+\.)*\d+([\-_]r\d+)*)/", ud.path)
m = self.dirver_regex_comp.search(ud.path)
bb.debug(3, "path = %s" % (ud.path))
bb.debug(3, "Regex: %s" % (self.name_version_type_regex.pattern))
bb.debug(3, "Regex: %s" % (self.package_regex_comp.pattern))
if m and not regex_uri:
dirver = m.group('dirver')
# generate the new uri after removing version directory name