From c1e29f844f6fd8d28142eb2a4903761b931a1624 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 24 Jun 2013 13:25:29 +0100
Subject: [PATCH] Make force-autopkgtest apply to the tested package, not the
 triggering package.

---
 britney.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/britney.py b/britney.py
index c7c58c6..6ca72ac 100755
--- a/britney.py
+++ b/britney.py
@@ -1784,20 +1784,21 @@ class Britney(object):
                     e.addhtml(
                         "autopkgtest for %s %s: %s" % (adtsrc, adtver, status))
                     if status != "PASS":
-                        adtpass = False
+                        forces = [
+                            x for x in self.hints.search(
+                                'force-autopkgtest', package=adtsrc)
+                            if self.same_source(adtver, x.version) ]
+                        if forces:
+                            e.addhtml(
+                                "Should ignore, but forced by %s" %
+                                forces[0].user)
+                        else:
+                            adtpass = False
                 if not adtpass:
-                    forces = [
-                        x for x in self.hints.search(
-                            'force-autopkgtest', package=e.name)
-                        if self.same_source(e.ver[1], x.version) ]
-                    if forces:
-                        e.addhtml(
-                            "Should ignore, but forced by %s" % forces[0].user)
-                    else:
-                        upgrade_me.remove(e.name)
-                        unconsidered.append(e.name)
-                        e.addhtml("Not considered")
-                        e.is_valid = False
+                    upgrade_me.remove(e.name)
+                    unconsidered.append(e.name)
+                    e.addhtml("Not considered")
+                    e.is_valid = False
 
         # invalidate impossible excuses
         for e in self.excuses: