From c04c71055ec84802ffbfd8fafa3b36fe736412f4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 26 Jun 2013 17:57:37 +0100 Subject: [PATCH] Only issue "From wrong source" for binaries not at the same version in testing (same-version could happen for merged binaries in partial-unstable mode). --- britney.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/britney.py b/britney.py index 7a3e6e4..2206b01 100755 --- a/britney.py +++ b/britney.py @@ -1301,9 +1301,10 @@ class Britney(object): # if the new binary package is not from the same source as the testing one, then skip it if not self.same_source(source_t[VERSION], pkgsv): - anywrongver = True - excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_t[VERSION])) - break + if binary_t is None or binary_t[VERSION] != binary_u[VERSION]: + anywrongver = True + excuse.addhtml("From wrong source: %s %s (%s not %s)" % (pkg_name, binary_u[VERSION], pkgsv, source_t[VERSION])) + break # find unsatisfied dependencies for the new binary package self.excuse_unsat_deps(pkg_name, src, arch, suite, excuse)