From 5f95cf771e742f88734e4d85c2c66b1eab06e4f8 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. --- britney2/excusefinder.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/britney2/excusefinder.py b/britney2/excusefinder.py index 26ceadf..3675c6b 100644 --- a/britney2/excusefinder.py +++ b/britney2/excusefinder.py @@ -138,12 +138,13 @@ class ExcuseFinder(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.add_verdict_info( - wrong_verdict, - "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.add_verdict_info( + wrong_verdict, + "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: