Merge ~juliank/britney/+git/britney2-ubuntu:less-force-reset-test-logging into ~ubuntu-release/britney/+git/britney2-ubuntu:master

Proposed by Julian Andres Klode
Status: Merged
Merged at revision: 11a023d1338fb17c0a5ff4083b0c1c016b84dded
Proposed branch: ~juliank/britney/+git/britney2-ubuntu:less-force-reset-test-logging
Merge into: ~ubuntu-release/britney/+git/britney2-ubuntu:master
Diff against target: 16 lines (+1/-1)
1 file modified
britney2/policies/autopkgtest.py (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+411466@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/britney2/policies/autopkgtest.py b/britney2/policies/autopkgtest.py
2index 7f970be..2fbf7c1 100644
3--- a/britney2/policies/autopkgtest.py
4+++ b/britney2/policies/autopkgtest.py
5@@ -1415,10 +1415,10 @@ class AutopkgtestPolicy(BasePolicy):
6 self.reset_hints = self.hints.search('force-reset-test')
7
8 for hint in self.reset_hints:
9- self.logger.info('Checking hints for %s/%s/%s: %s' % (src, ver, arch, str(hint)))
10 for mi in hint.packages:
11 if mi.package != src:
12 continue
13+ self.logger.info('Checking hints for %s/%s/%s: %s' % (src, ver, arch, str(hint)))
14 if (mi.architecture in ['source', arch] and
15 mi.version != 'all' and
16 apt_pkg.version_compare(mi.version, ver) >= 0):

Subscribers

People subscribed via source and target branches