aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas C. Villa Real <lucasvr@gobolinux.org>2018-07-04 13:11:14 -0300
committerLucas C. Villa Real <lucasvr@gobolinux.org>2018-07-04 13:11:14 -0300
commit7af5955bb84a436de0a623642c4d3a73e1c2ed98 (patch)
tree74493459bb77172125236c18d26eab3854009768
parent09b7e525463b720e107ae32b9b714621b12513c3 (diff)
downloadThirdPartyInstallers-7af5955bb84a436de0a623642c4d3a73e1c2ed98.tar.xz
Do not fail if the infopage could not be parsed.
-rwxr-xr-xbin/RPMFinder9
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/RPMFinder b/bin/RPMFinder
index 1811222..06bd517 100755
--- a/bin/RPMFinder
+++ b/bin/RPMFinder
@@ -166,6 +166,8 @@ class RPMFinder:
requested_archs = self.arch.split(",")
for archnum,arch in enumerate(requested_archs):
pkginfo = self.__search_rpmfind_net(arch)
+ if pkginfo is None:
+ continue
indexes = self.__filter_by_name(pkginfo.urls, pkginfo.name, arch)
if len(indexes) == 0 and archnum == len(requested_archs)-1:
# User possibly requested more than one architecture (e.g., "noarch,x86_64")
@@ -243,15 +245,16 @@ class RPMFinder:
html = subprocess.check_output(["wget", "--quiet", "{0}{1}".format(self.baseuri, query), "-O", "-"])
htmlparser.feed(str(html))
except subprocess.CalledProcessError:
- sys.stderr.write("error retrieving url {0}{1}".format(self.baseuri, query))
+ # Fatal error
+ sys.stderr.write("error retrieving url {0}{1}\n".format(self.baseuri, query))
return None
for infopage in htmlparser.get_pkginfo().infopages:
try:
html = subprocess.check_output(["wget", "--quiet", "{0}{1}".format(self.baseuri, infopage), "-O", "-"])
htmlparser.feed(str(html))
except subprocess.CalledProcessError:
- sys.stderr.write("error retrieving url {0}{1}".format(self.baseuri, infopage))
- return None
+ # Non-fatal error
+ sys.stderr.write("error retrieving url {0}{1}\n".format(self.baseuri, infopage))
return htmlparser.get_pkginfo(self.baseuri)