write_heidi: Include cruft arch:all packages in the output

Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2017-11-19 21:47:38 +00:00
parent 0b58a313cb
commit 5c3229467a
2 changed files with 9 additions and 3 deletions

View File

@ -2498,7 +2498,8 @@ class Britney(object):
# write HeidiResult # write HeidiResult
self.log("Writing Heidi results to %s" % self.options.heidi_output) self.log("Writing Heidi results to %s" % self.options.heidi_output)
write_heidi(self.options.heidi_output, self.sources["testing"], write_heidi(self.options.heidi_output, self.sources["testing"],
self.binaries["testing"]) self.binaries["testing"],
outofsync_arches=self.options.outofsync_arches)
self.log("Writing delta to %s" % self.options.heidi_delta_output) self.log("Writing delta to %s" % self.options.heidi_delta_output)
write_heidi_delta(self.options.heidi_delta_output, write_heidi_delta(self.options.heidi_delta_output,

View File

@ -258,7 +258,7 @@ def eval_uninst(architectures, nuninst):
return "".join(parts) return "".join(parts)
def write_heidi(filename, sources_t, packages_t, sorted=sorted): def write_heidi(filename, sources_t, packages_t, *, outofsync_arches=frozenset(), sorted=sorted):
"""Write the output HeidiResult """Write the output HeidiResult
This method write the output for Heidi, which contains all the This method write the output for Heidi, which contains all the
@ -271,6 +271,10 @@ def write_heidi(filename, sources_t, packages_t, sorted=sorted):
packages in "sources_t" and "packages_t" to be the packages in packages in "sources_t" and "packages_t" to be the packages in
"testing". "testing".
outofsync_arches: If given, it is a set of architectures marked
as "out of sync". The output file may exclude some out of date
arch:all packages for those architectures to reduce the noise.
The "X=X" parameters are optimizations to avoid "load global" in The "X=X" parameters are optimizations to avoid "load global" in
the loops. the loops.
""" """
@ -288,7 +292,8 @@ def write_heidi(filename, sources_t, packages_t, sorted=sorted):
# Faux package; not really a part of testing # Faux package; not really a part of testing
continue continue
if pkg.source_version and pkgarch == 'all' and \ if pkg.source_version and pkgarch == 'all' and \
pkg.source_version != sources_t[pkg.source].version: pkg.source_version != sources_t[pkg.source].version and \
arch in outofsync_arches:
# when architectures are marked as "outofsync", their binary # when architectures are marked as "outofsync", their binary
# versions may be lower than those of the associated # versions may be lower than those of the associated
# source package in testing. the binary package list for # source package in testing. the binary package list for