Always output excuses for packages with "wrong source" issues

Previously whether such packages received excuses, and the specific
content of such excuses, was dependent on the order in which their
binary packages were considered.

Signed-off-by: Adam D. Barratt <adam@adam-barratt.org.uk>
master
Adam D. Barratt 9 years ago
parent 1e99c780da
commit 8480e1859c

@ -1158,14 +1158,14 @@ class Britney(object):
if not same_source(source_t[VERSION], pkgsv): if not same_source(source_t[VERSION], pkgsv):
anywrongver = True anywrongver = True
excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_t[VERSION])) excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_t[VERSION]))
break continue
# if the source package has been updated in unstable and this is a binary migration, skip it # if the source package has been updated in unstable and this is a binary migration, skip it
# (the binaries are now out-of-date) # (the binaries are now out-of-date)
if same_source(source_t[VERSION], pkgsv) and source_t[VERSION] != source_u[VERSION]: if same_source(source_t[VERSION], pkgsv) and source_t[VERSION] != source_u[VERSION]:
anywrongver = True anywrongver = True
excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_u[VERSION])) excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_u[VERSION]))
break continue
# find unsatisfied dependencies for the new binary package # find unsatisfied dependencies for the new binary package
self.excuse_unsat_deps(pkg_name, src, arch, suite, excuse) self.excuse_unsat_deps(pkg_name, src, arch, suite, excuse)

Loading…
Cancel
Save