From 5dc162404f6b41308e8fce3a241602af9057e1d9 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Mon, 11 Jul 2016 17:33:11 +0000 Subject: [PATCH] Actually forgive missing Packages files for new arches Signed-off-by: Niels Thykier --- britney.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/britney.py b/britney.py index add9dca..b088ea2 100755 --- a/britney.py +++ b/britney.py @@ -986,15 +986,13 @@ class Britney(object): if arch not in self.options.new_arches: raise self.log("Ignoring missing file for new arch %s: %s" % (arch, filename)) + continue udeb_filename = os.path.join(basedir, component, "debian-installer", binary_dir, "Packages") - try: - udeb_filename = possibly_compressed(udeb_filename) - except FileNotFoundError as e: - if arch not in self.options.new_arches: - raise - self.log("Ignoring missing file for new arch %s: %s" % (arch, udeb_filename)) + # We assume the udeb Packages file is present if the + # regular one is present + udeb_filename = possibly_compressed(udeb_filename) self._read_packages_file(filename, arch, self.sources[distribution], packages) self._read_packages_file(udeb_filename, arch,