Merge branch 'fix-ppa-pull-lp-1938659' of git+ssh://git.launchpad.net/~alexmurray/ubuntu-dev-tools

MR: https://code.launchpad.net/~alexmurray/ubuntu-dev-tools/+git/ubuntu-dev-tools/+merge/406518
Signed-off-by: Mattia Rizzolo <mattia@debian.org>
This commit is contained in:
Mattia Rizzolo 2021-08-04 12:02:46 +02:00
commit 511aa3d80c
No known key found for this signature in database
GPG Key ID: 0816B9E18C762BAD
2 changed files with 6 additions and 3 deletions

5
debian/changelog vendored
View File

@ -1,6 +1,9 @@
ubuntu-dev-tools (0.185) UNRELEASED; urgency=medium
* WIP.
[ Alex Murray ]
* ubuntutools/archive.py:
+ Fix crash due to PersonalPackageArchiveSourcePackage() returning the
wrong object when requesting a download url. LP: #1938659
-- Mattia Rizzolo <mattia@debian.org> Wed, 04 Aug 2021 11:59:05 +0200

View File

@ -674,14 +674,14 @@ class PersonalPackageArchiveSourcePackage(UbuntuSourcePackage):
if self.getArchive().private:
yield self._private_ppa_url(name)
else:
yield super()._source_urls(name)
yield from super()._source_urls(name)
def _binary_urls(self, name, bpph):
"Generator of URLs for name"
if self.getArchive().private:
yield self._private_ppa_url(name)
else:
yield super()._binary_urls(name, bpph)
yield from super()._binary_urls(name, bpph)
class UbuntuCloudArchiveSourcePackage(PersonalPackageArchiveSourcePackage):