python-oops-tools

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

  1. bug-1003627
  2. Merge into trunk
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
1=== modified file 'src/oopstools/NEWS.txt'
2--- src/oopstools/NEWS.txt 2012-09-25 06:39:01 +0000
3+++ src/oopstools/NEWS.txt 2012-09-26 07:34:21 +0000
4@@ -5,12 +5,18 @@
5 NEXT
6 ====
7
8-0.0.6
9+0.6.7
10+=====
11+
12+* Permit multiple project/project groups to be supplied to prune.
13+ (Robert Collins, #1003627)
14+
15+0.6.6
16 =====
17
18 The brown paper bag edition.
19
20-* Fix typoes that prevented the new timeline-django code installing or working
21+* Fix typos that prevented the new timeline-django code installing or working
22 properly. (Robert Collins)
23
24 0.6.5
25
26=== modified file 'src/oopstools/scripts/prune.py'
27--- src/oopstools/scripts/prune.py 2012-09-18 07:36:36 +0000
28+++ src/oopstools/scripts/prune.py 2012-09-26 07:34:21 +0000
29@@ -40,7 +40,7 @@
30 %prog [options]
31
32 The following options must be supplied:
33- Either
34+ At least one of
35 --project
36 or
37 --projectgroup
38@@ -50,6 +50,8 @@
39
40 Will process every member project of launchpad-project.
41
42+ Project and projectgroup can be supplied multiple times.
43+
44 When run this program will ask Launchpad for OOPS references made since
45 the last date it pruned up to, with an upper limit of one week from
46 today. It then looks in the database for all oopses created during that
47@@ -65,9 +67,9 @@
48 "Delete OOPS reports that are not referenced in a bug tracker."
49 parser = optparse.OptionParser(
50 description=description, usage=usage)
51- parser.add_option('--project',
52+ parser.add_option('--project', action="append",
53 help="Launchpad project to find references in.")
54- parser.add_option('--projectgroup',
55+ parser.add_option('--projectgroup', action="append",
56 help="Launchpad project group to find references in.")
57 parser.add_option(
58 '--lpinstance', help="Launchpad instance to use", default="production")
59@@ -83,9 +85,6 @@
60 else:
61 raise ValueError(
62 'One of options %s must be supplied' % (optnames,))
63- elif len(present) != 1:
64- raise ValueError(
65- 'Only one of options %s can be supplied' % (optnames,))
66 needed('project', 'projectgroup')
67 logging.basicConfig(
68 filename='prune.log', filemode='w', level=logging.DEBUG)
69
70=== modified file 'src/oopstools/version.txt'
71--- src/oopstools/version.txt 2012-09-25 06:39:01 +0000
72+++ src/oopstools/version.txt 2012-09-26 07:34:21 +0000
73@@ -1,1 +1,1 @@
74-0.6.6
75+0.6.7
76
77=== modified file 'versions.cfg'
78--- versions.cfg 2012-09-24 04:08:54 +0000
79+++ versions.cfg 2012-09-26 07:34:21 +0000
80@@ -22,7 +22,7 @@
81 mechanize = 0.1.11
82 oops = 0.0.10
83 oops-amqp = 0.0.5
84-oops-datedir-repo = 0.0.19
85+oops-datedir-repo = 0.0.20
86 oops-timeline = 0.0.2
87 oops-wsgi = 0.0.10
88 # XXX: 2011-11-17 GavinPanella bug=891249: pyscopg2 2.4.2 is

Subscribers

People subscribed via source and target branches

to all changes: