From 6ca12331d6863d96370fee847e295d74b8d1da8b Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Thu, 16 Sep 2021 21:01:19 -0400 Subject: [PATCH] archive: use proper component source packages sometimes have different component than their bpphs, so use the correct component when downloading binaries LP: #1943819 --- ubuntutools/archive.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py index 3d7561e..0ad2658 100644 --- a/ubuntutools/archive.py +++ b/ubuntutools/archive.py @@ -302,13 +302,13 @@ class SourcePackage(ABC): def getArchive(self): return self.getDistribution().getArchive() - def _mirror_url(self, mirror, filename): + def _mirror_url(self, mirror, component, filename): "Build a source package URL on a mirror" if self.source.startswith('lib'): group = self.source[:4] else: group = self.source[0] - return os.path.join(mirror, 'pool', self.component, group, + return os.path.join(mirror, 'pool', component, group, self.source, filename) def _archive_servers(self): @@ -325,14 +325,14 @@ class SourcePackage(ABC): if self._dsc_source: yield str(self._dsc_source.parent / name) for server in self._archive_servers(): - yield self._mirror_url(server, name) + yield self._mirror_url(server, self.component, name) if self.lp_spph.sourceFileUrl(name): yield self.lp_spph.sourceFileUrl(name) def _binary_urls(self, name, bpph): "Generator of URLs for name" for server in self._archive_servers(): - yield self._mirror_url(server, name) + yield self._mirror_url(server, bpph.getComponent(), name) if bpph.binaryFileUrl(name): yield bpph.binaryFileUrl(name) if bpph.getUrl():