Actually forgive missing Packages files for new arches

Signed-off-by: Niels Thykier <niels@thykier.net>
debian
Niels Thykier 9 years ago
parent ac670bc75e
commit 5dc162404f

@ -986,15 +986,13 @@ class Britney(object):
if arch not in self.options.new_arches: if arch not in self.options.new_arches:
raise raise
self.log("Ignoring missing file for new arch %s: %s" % (arch, filename)) self.log("Ignoring missing file for new arch %s: %s" % (arch, filename))
continue
udeb_filename = os.path.join(basedir, udeb_filename = os.path.join(basedir,
component, "debian-installer", component, "debian-installer",
binary_dir, "Packages") binary_dir, "Packages")
try: # We assume the udeb Packages file is present if the
udeb_filename = possibly_compressed(udeb_filename) # regular one is present
except FileNotFoundError as e: udeb_filename = possibly_compressed(udeb_filename)
if arch not in self.options.new_arches:
raise
self.log("Ignoring missing file for new arch %s: %s" % (arch, udeb_filename))
self._read_packages_file(filename, arch, self._read_packages_file(filename, arch,
self.sources[distribution], packages) self.sources[distribution], packages)
self._read_packages_file(udeb_filename, arch, self._read_packages_file(udeb_filename, arch,

Loading…
Cancel
Save