Merge lp:~dholbach/click-reviewers-tools/1390163 into lp:click-reviewers-tools

Proposed by Daniel Holbach
Status: Merged
Merged at revision: 347
Proposed branch: lp:~dholbach/click-reviewers-tools/1390163
Merge into: lp:click-reviewers-tools
Diff against target: 57 lines (+12/-3)
2 files modified
clickreviews/cr_security.py (+7/-2)
debian/changelog (+5/-1)
To merge this branch: bzr merge lp:~dholbach/click-reviewers-tools/1390163
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+244875@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

<jdstrand> dholbach: it looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'clickreviews/cr_security.py'
--- clickreviews/cr_security.py 2014-12-04 15:05:27 +0000
+++ clickreviews/cr_security.py 2014-12-16 16:14:15 +0000
@@ -294,10 +294,12 @@
294 t = 'info'294 t = 'info'
295 n = 'policy_version_is_highest (%s, %s)' % (str(highest), f)295 n = 'policy_version_is_highest (%s, %s)' % (str(highest), f)
296 s = "OK"296 s = "OK"
297 l = None
297 if float(m['policy_version']) != highest:298 if float(m['policy_version']) != highest:
298 t = 'info'299 t = 'info'
300 l = 'http://askubuntu.com/q/562116/94326'
299 s = '%s != %s' % (str(m['policy_version']), str(highest))301 s = '%s != %s' % (str(m['policy_version']), str(highest))
300 self._add_result(t, n, s)302 self._add_result(t, n, s, l)
301303
302 t = 'info'304 t = 'info'
303 n = 'policy_version_matches_framework (%s)' % (f)305 n = 'policy_version_matches_framework (%s)' % (f)
@@ -555,6 +557,7 @@
555 t = 'info'557 t = 'info'
556 n = 'policy_groups_safe_%s (%s)' % (app, i)558 n = 'policy_groups_safe_%s (%s)' % (app, i)
557 s = 'OK'559 s = 'OK'
560 l = None
558 manual_review = False561 manual_review = False
559562
560 aa_type = self._get_policy_group_type(vendor, version, i)563 aa_type = self._get_policy_group_type(vendor, version, i)
@@ -566,12 +569,14 @@
566 t = 'error'569 t = 'error'
567 s = "(MANUAL REVIEW) %s policy group " % aa_type + \570 s = "(MANUAL REVIEW) %s policy group " % aa_type + \
568 "'%s': vetted applications only" % (i)571 "'%s': vetted applications only" % (i)
572 if i == "debug":
573 l = 'http://askubuntu.com/a/562123/94326'
569 manual_review = True574 manual_review = True
570 elif aa_type != "common":575 elif aa_type != "common":
571 t = 'error'576 t = 'error'
572 s = "policy group '%s' has" % i + \577 s = "policy group '%s' has" % i + \
573 "unknown type '%s'" % (aa_type)578 "unknown type '%s'" % (aa_type)
574 self._add_result(t, n, s, manual_review=manual_review)579 self._add_result(t, n, s, l, manual_review=manual_review)
575580
576 def check_ignored(self):581 def check_ignored(self):
577 '''Check ignored fields'''582 '''Check ignored fields'''
578583
=== modified file 'debian/changelog'
--- debian/changelog 2014-12-10 18:16:46 +0000
+++ debian/changelog 2014-12-16 16:14:15 +0000
@@ -29,7 +29,11 @@
29 * allow filenames to end with .snap29 * allow filenames to end with .snap
30 * allow flat namesapces in check_maintainer_email()30 * allow flat namesapces in check_maintainer_email()
3131
32 -- Jamie Strandboge <jamie@ubuntu.com> Wed, 03 Dec 2014 09:43:57 -060032 [ Daniel Holbach ]
33 * Add askubuntu explanation for policy_version_is_highest.
34 * Add askubuntu explanation for debug builds. (LP: #1390163)
35
36 -- Daniel Holbach <daniel.holbach@ubuntu.com> Tue, 16 Dec 2014 17:07:36 +0100
3337
34click-reviewers-tools (0.18) utopic; urgency=medium38click-reviewers-tools (0.18) utopic; urgency=medium
3539

Subscribers

People subscribed via source and target branches