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

archive: remove _binary_files_info()

Browse Source 
also use spph/bpph provided urls
This commit is contained in:
Dan Streetman 2020-01-22 14:33:51 -05:00
parent 8ebd086aac
commit e1f2cbf831
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ubuntutools/archive.py
View File

@ -318,23 +318,22 @@ class SourcePackage(object):
for mirror in self.masters: for mirror in self.masters:
if mirror not in self.mirrors: if mirror not in self.mirrors:
yield self._mirror_url(mirror, name) yield self._mirror_url(mirror, name)
if self.lp_spph.sourceFileUrl(name):
yield self.lp_spph.sourceFileUrl(name)
yield self._lp_url(name, source=True) yield self._lp_url(name, source=True)
def _binary_urls(self, name, default_urls): def _binary_urls(self, name, bpph):
"Generator of URLs for name" "Generator of URLs for name"
for mirror in self.mirrors: for mirror in self.mirrors:
yield self._mirror_url(mirror, name) yield self._mirror_url(mirror, name)
for mirror in self.masters: for mirror in self.masters:
if mirror not in self.mirrors: if mirror not in self.mirrors:
yield self._mirror_url(mirror, name) yield self._mirror_url(mirror, name)
if bpph.binaryFileUrl(name):
yield bpph.binaryFileUrl(name)
if bpph.getUrl():
yield bpph.getUrl()
yield self._lp_url(name) yield self._lp_url(name)
for url in default_urls:
yield url
def _binary_files_info(self, arch, name, ext):
for bpph in self.lp_spph.getBinaries(arch=arch, name=name, ext=ext):
urls = bpph.binaryFileUrls() + [bpph.getUrl()]
yield (bpph.getFileName(), urls, 0)
def pull_dsc(self): def pull_dsc(self):
"Retrieve dscfile and parse" "Retrieve dscfile and parse"
@ -532,9 +531,13 @@ class SourcePackage(object):
if arch == 'all': if arch == 'all':
arch = None arch = None
for (fname, furls, fsize) in self._binary_files_info(arch, name, ext): for bpph in self.lp_spph.getBinaries(arch=arch, name=name, ext=ext):
found = False found = False
for url in self._binary_urls(fname, furls): fname = bpph.getFileName()
fsha1 = bpph.binaryFileSha1(fname)
fsha256 = bpph.binaryFileSha256(fname)
fsize = bpph.binaryFileSize(fname)
for url in self._binary_urls(fname, bpph):
try: try:
if self._download_file(url, fname, False, fsize): if self._download_file(url, fname, False, fsize):
found = True found = True
@ -670,10 +673,6 @@ class DebianSourcePackage(SourcePackage):
if name in self.snapshot_files: if name in self.snapshot_files:
yield self.snapshot_files[name] yield self.snapshot_files[name]
def _binary_files_info(self, arch, name, ext):
for f in self.snapshot_package.getBinaryFiles(arch=arch, name=name, ext=ext):
yield (f.name, [f.getUrl()], f.size)
def pull_dsc(self): def pull_dsc(self):
"Retrieve dscfile and parse" "Retrieve dscfile and parse"
try: try: