Merge ~ubuntu-release/britney/+git/britney2-ubuntu:broken-hint-logging into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Steve Langasek]

Fix wrong log message

Britney2's Hint object has no 'days' attribute, so we ought not try to print it.

Seen in the wild for several hours during the Artful Alpha 1 milestone freeze, when a duplicate block hint caused britney to fail to run due to the resulting exception.

Unmerged commits

b80b8c5... by Steve Langasek on 2017-06-28

Fix wrong log message

Britney2's Hint object has no 'days' attribute, so we ought not try to
print it.

Seen in the wild for several hours during the Artful Alpha 1 milestone
freeze, when a duplicate block hint caused britney to fail to run due to
the resulting exception.

41ac7a8... by Steve Langasek on 2017-04-07

Drop transitional code

16cca9c... by Robert Bruce Park on 2017-03-24

Change SourcePPAPolicy from a blacklist to a whitelist.

858775a... by Iain Lane on 2017-03-22

email: Make REJECTED_TEMPORARILY packages be not emailed for

These are rejections that we expect to clear out on their own or convert
to REJECTED_PERMANENTLY, at which point we will email.

https://bugs.launchpad.net/britney/+bug/1671468

e00d86a... by Iain Lane on 2017-03-22

email: If a package is blocked by an explicit block, don't mail

8350694... by Iain Lane on 2017-03-22

email: Add tests that send email through a mocked SMTP server

I want to fix two bugs in interactions between other parts of britney
and the email policy. It's not currently easy to do so because we just
run the policy itself manually by creating some fake excuses.

Steal part of the machinery from the autopkgtest tests, and run a few
tests through britney completely. Use a fake SMTP server to record which
emails we sent.

(The port is hardcoded - that might not be so smart.)

63573fa... by Robert Bruce Park on 2017-03-17

Resend emails periodically.

322108d... by Iain Lane on 2017-03-14

email: beef up the tests very slightly

  - add a day/days case for '1' exactly
  - make some other daysold be non ints

0579677... by Robert Bruce Park on 2017-03-13

Stop writing "1 days" in emails.

1b4828b... by Robert Bruce Park on 2017-03-10

Write email cache after every email sent.

diff --git a/britney.py b/britney.py
index de20218..847aecc 100755
--- a/britney.py
+++ b/britney.py
@@ -1077,9 +1077,9 @@ class Britney(object):
                                (x, package, hint.version, hint.user, hint2.version, hint2.user), type="W")
                             hint.set_active(False)
                     else:
-                        self.log("Overriding %s[%s] = ('%s', '%s', '%s') with ('%s', '%s', '%s')" %
-                           (x, package, hint2.version, hint2.user, hint2.days,
-                            hint.version, hint.user, hint.days), type="W")
+                        self.log("Overriding %s[%s] = ('%s', '%s') with ('%s', '%s')" %
+                           (x, package, hint2.version, hint2.user,
+                            hint.version, hint.user), type="W")
                         hint2.set_active(False)
 
                 z[package] = key