From b1134d9712928ac80d129407fe4f012a7d456624 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 3edf89b..d621e61 100755 --- a/britney.py +++ b/britney.py @@ -1403,9 +1403,10 @@ class Britney(object): # if the new binary package is not from the same source as the testing one, then skip it # this implies that this binary migration is part of a source migration if source_u.version == pkgsv and 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)) - continue + 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)) + continue # cruft in unstable if source_u.version != pkgsv and source_t.version != pkgsv: