Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-06-24 06:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

archive: use _download_file_from_urls()

Browse Source 
Both pull() and pull_binaries() are changed to use the common function.

Signed-off-by: Dan Streetman <ddstreet@canonical.com>
This commit is contained in:
Dan Streetman 2020-03-13 09:52:50 -04:00
parent b6e0b5b388
commit b2f4ceee8e
1 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ubuntutools/archive.py
View File

@ -463,20 +463,8 @@ class SourcePackage(object):
self._write_dsc() self._write_dsc()
for entry in self.dsc['Files']: for entry in self.dsc['Files']:
name = entry['name'] name = entry['name']
for url in self._source_urls(name): urls = self._source_urls(name)
try: self._download_file_from_urls(urls, name, int(entry['size']), dscverify=True)
if self._download_file(url, name, int(entry['size']), dscverify=True):
break
except HTTPError as e:
# It's ok if the file isn't found; we try multiple places to download
if e.code == 404:
Logger.debug("File not found at %s" % url)
continue
Logger.error('HTTP Error %i: %s', e.code, str(e))
except URLError as e:
Logger.error('URL Error: %s', e.reason)
else:
raise DownloadError('File %s could not be found' % name)
def pull_binaries(self, arch=None, name=None, ext=None): def pull_binaries(self, arch=None, name=None, ext=None):
"""Pull binary debs into workdir. """Pull binary debs into workdir.
@ -489,34 +477,25 @@ class SourcePackage(object):
Returns the number of files downloaded. Returns the number of files downloaded.
""" """
total = 0
Logger.debug("pull_binaries(arch=%s, name=%s, ext=%s)" % (arch, name, ext)) Logger.debug("pull_binaries(arch=%s, name=%s, ext=%s)" % (arch, name, ext))
if arch == 'all': if arch == 'all':
arch = None arch = None
total = 0
for bpph in self.lp_spph.getBinaries(arch=arch, name=name, ext=ext): for bpph in self.lp_spph.getBinaries(arch=arch, name=name, ext=ext):
fname = bpph.getFileName() fname = bpph.getFileName()
fsha1 = bpph.binaryFileSha1(fname) fsha1 = bpph.binaryFileSha1(fname)
fsha256 = bpph.binaryFileSha256(fname) fsha256 = bpph.binaryFileSha256(fname)
fsize = bpph.binaryFileSize(fname) fsize = bpph.binaryFileSize(fname)
for url in self._binary_urls(fname, bpph): urls = self._binary_urls(fname, bpph)
try: try:
if self._download_file(url, fname, fsize, self._download_file_from_urls(urls, fname, fsize,
sha1sum=fsha1, sha256sum=fsha256): sha1sum=fsha1, sha256sum=fsha256)
total += 1 total += 1
break except DownloadError as e:
except HTTPError as e: # log/print the error, but continue to get the rest of the files
# It's ok if the file isn't found; we try multiple places to download Logger.error(e)
if e.code == 404:
Logger.debug("File not found at %s" % url)
continue
Logger.error('HTTP Error %i: %s', e.code, str(e))
except URLError as e:
Logger.error('URL Error: %s', e.reason)
else:
Logger.error("Could not download from any location: %s", fname)
return total return total
def verify(self): def verify(self):