From ee0d5096de21d489eac03f0e154bfb7db3e676ab Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt@canonical.com>
Date: Tue, 11 Aug 2015 17:19:02 +0200
Subject: [PATCH] Fix KeyError from last commit, needs more thorough debugging
 when that happens

---
 autopkgtest.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/autopkgtest.py b/autopkgtest.py
index b1b60fa..8efd660 100644
--- a/autopkgtest.py
+++ b/autopkgtest.py
@@ -530,10 +530,8 @@ class AutoPackageTest(object):
                             passed = False
                             continue
 
-                        # ignore if Swift results are disabled
-                        if not hasattr(self.britney.options, 'adt_swift_url'):
-                            continue
-                        raise
+                        # ignore if adt or swift results are disabled
+                        continue
 
             # disabled or ignored?
             if not arch_status: