Merge lp:~lifeless/python-oops-tools/bug-1003627 into lp:python-oops-tools

Proposed by Robert Collins
Status: Merged
Approved by: Steve Kowalik
Approved revision: 48
Merged at revision: 48
Proposed branch: lp:~lifeless/python-oops-tools/bug-1003627
Merge into: lp:python-oops-tools
Diff against target: 88 lines (+15/-10)
4 files modified
src/oopstools/NEWS.txt (+8/-2)
src/oopstools/scripts/prune.py (+5/-6)
src/oopstools/version.txt (+1/-1)
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~lifeless/python-oops-tools/bug-1003627
Reviewer Review Type Date Requested Status
Steve Kowalik (community) code Approve
Review via email: mp+126401@code.launchpad.net

Commit message

0.6.7: make it possible to supply a complete list of projects or project groups to prune.

Description of the change

oops-tools side of bug 1003627 - make the options append rather than literal values. bump the datedir-repo dependency to get the new backend code.

To post a comment you must log in.
Revision history for this message
Steve Kowalik (stevenk) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/oopstools/NEWS.txt'
--- src/oopstools/NEWS.txt 2012-09-25 06:39:01 +0000
+++ src/oopstools/NEWS.txt 2012-09-26 07:34:21 +0000
@@ -5,12 +5,18 @@
5NEXT5NEXT
6====6====
77
80.0.680.6.7
9=====
10
11* Permit multiple project/project groups to be supplied to prune.
12 (Robert Collins, #1003627)
13
140.6.6
9=====15=====
1016
11The brown paper bag edition.17The brown paper bag edition.
1218
13* Fix typoes that prevented the new timeline-django code installing or working19* Fix typos that prevented the new timeline-django code installing or working
14 properly. (Robert Collins)20 properly. (Robert Collins)
1521
160.6.5220.6.5
1723
=== modified file 'src/oopstools/scripts/prune.py'
--- src/oopstools/scripts/prune.py 2012-09-18 07:36:36 +0000
+++ src/oopstools/scripts/prune.py 2012-09-26 07:34:21 +0000
@@ -40,7 +40,7 @@
40 %prog [options]40 %prog [options]
4141
42 The following options must be supplied:42 The following options must be supplied:
43 Either43 At least one of
44 --project44 --project
45 or45 or
46 --projectgroup46 --projectgroup
@@ -50,6 +50,8 @@
5050
51 Will process every member project of launchpad-project.51 Will process every member project of launchpad-project.
5252
53 Project and projectgroup can be supplied multiple times.
54
53 When run this program will ask Launchpad for OOPS references made since55 When run this program will ask Launchpad for OOPS references made since
54 the last date it pruned up to, with an upper limit of one week from56 the last date it pruned up to, with an upper limit of one week from
55 today. It then looks in the database for all oopses created during that57 today. It then looks in the database for all oopses created during that
@@ -65,9 +67,9 @@
65 "Delete OOPS reports that are not referenced in a bug tracker."67 "Delete OOPS reports that are not referenced in a bug tracker."
66 parser = optparse.OptionParser(68 parser = optparse.OptionParser(
67 description=description, usage=usage)69 description=description, usage=usage)
68 parser.add_option('--project',70 parser.add_option('--project', action="append",
69 help="Launchpad project to find references in.")71 help="Launchpad project to find references in.")
70 parser.add_option('--projectgroup',72 parser.add_option('--projectgroup', action="append",
71 help="Launchpad project group to find references in.")73 help="Launchpad project group to find references in.")
72 parser.add_option(74 parser.add_option(
73 '--lpinstance', help="Launchpad instance to use", default="production")75 '--lpinstance', help="Launchpad instance to use", default="production")
@@ -83,9 +85,6 @@
83 else:85 else:
84 raise ValueError(86 raise ValueError(
85 'One of options %s must be supplied' % (optnames,))87 'One of options %s must be supplied' % (optnames,))
86 elif len(present) != 1:
87 raise ValueError(
88 'Only one of options %s can be supplied' % (optnames,))
89 needed('project', 'projectgroup')88 needed('project', 'projectgroup')
90 logging.basicConfig(89 logging.basicConfig(
91 filename='prune.log', filemode='w', level=logging.DEBUG)90 filename='prune.log', filemode='w', level=logging.DEBUG)
9291
=== modified file 'src/oopstools/version.txt'
--- src/oopstools/version.txt 2012-09-25 06:39:01 +0000
+++ src/oopstools/version.txt 2012-09-26 07:34:21 +0000
@@ -1,1 +1,1 @@
10.6.610.6.7
22
=== modified file 'versions.cfg'
--- versions.cfg 2012-09-24 04:08:54 +0000
+++ versions.cfg 2012-09-26 07:34:21 +0000
@@ -22,7 +22,7 @@
22mechanize = 0.1.1122mechanize = 0.1.11
23oops = 0.0.1023oops = 0.0.10
24oops-amqp = 0.0.524oops-amqp = 0.0.5
25oops-datedir-repo = 0.0.1925oops-datedir-repo = 0.0.20
26oops-timeline = 0.0.226oops-timeline = 0.0.2
27oops-wsgi = 0.0.1027oops-wsgi = 0.0.10
28# XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is28# XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is

Subscribers

People subscribed via source and target branches

to all changes: