From 9792f5b95c672e312143aca94008aa6b2053637d Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Tue, 21 Jul 2020 15:18:49 -0400 Subject: [PATCH] archive: don't download from archive if using UCA staging ppa Signed-off-by: Dan Streetman --- ubuntutools/archive.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ubuntutools/archive.py b/ubuntutools/archive.py index 374f1da..46099d6 100644 --- a/ubuntutools/archive.py +++ b/ubuntutools/archive.py @@ -654,7 +654,13 @@ class UbuntuCloudArchiveSourcePackage(PersonalPackageArchiveSourcePackage): kwargs['ppa'] = f"{self.TEAM}/{series}-{pocket}" super(UbuntuCloudArchiveSourcePackage, self).__init__(*args, **kwargs) - self.masters = ["http://ubuntu-cloud.archive.canonical.com/ubuntu/"] + + if pocket == 'staging': + # Don't bother with the archive; just get directly from the staging ppa, since + # none of the binaries from the archive will match the staging checksums + self.masters = [] + else: + self.masters = ["http://ubuntu-cloud.archive.canonical.com/ubuntu/"] def pull_binaries(self, arch=None, name=None, ext=None): """Pull binary debs into workdir.