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

Proposed by Steve Langasek
Status: Needs review
Proposed branch: ~ubuntu-release/britney/+git/britney2-ubuntu:broken-hint-logging
Merge into: ~ubuntu-release/britney/+git/britney2-ubuntu:master
Diff against target: 17 lines (+3/-3)
1 file modified
britney.py (+3/-3)
Reviewer Review Type Date Requested Status
St├ęphane Graber Pending
Review via email: mp+326406@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Unmerged commits

b80b8c5... by 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.

41ac7a8... by Steve Langasek

Drop transitional code

16cca9c... by Robert Bruce Park

Change SourcePPAPolicy from a blacklist to a whitelist.

858775a... by Iain Lane

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

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

8350694... by Iain Lane

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

Resend emails periodically.

322108d... by Iain Lane

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

Stop writing "1 days" in emails.

1b4828b... by Robert Bruce Park

Write email cache after every email sent.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/britney.py b/britney.py
2index de20218..847aecc 100755
3--- a/britney.py
4+++ b/britney.py
5@@ -1077,9 +1077,9 @@ class Britney(object):
6 (x, package, hint.version, hint.user, hint2.version, hint2.user), type="W")
7 hint.set_active(False)
8 else:
9- self.log("Overriding %s[%s] = ('%s', '%s', '%s') with ('%s', '%s', '%s')" %
10- (x, package, hint2.version, hint2.user, hint2.days,
11- hint.version, hint.user, hint.days), type="W")
12+ self.log("Overriding %s[%s] = ('%s', '%s') with ('%s', '%s')" %
13+ (x, package, hint2.version, hint2.user,
14+ hint.version, hint.user), type="W")
15 hint2.set_active(False)
16
17 z[package] = key

Subscribers

People subscribed via source and target branches