Merge lp:~gothicx/apport/not_collect_duplicate_bug into lp:~ubuntu-core-dev/ubuntu/lucid/apport/ubuntu

Proposed by Marco Rodrigues
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gothicx/apport/not_collect_duplicate_bug
Merge into: lp:~ubuntu-core-dev/ubuntu/lucid/apport/ubuntu
Diff against target: 27 lines
2 files modified
debian/changelog (+2/-0)
debian/local/apport-collect (+4/-0)
To merge this branch: bzr merge lp:~gothicx/apport/not_collect_duplicate_bug
Reviewer Review Type Date Requested Status
Apport upstream developers Pending
Review via email: mp+14334@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
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-02 08:37:25 +0000
3+++ debian/changelog 2009-11-02 23:50:23 +0000
4@@ -4,6 +4,8 @@
5 * etc/default/apport: Replace the old init.d force_start command by
6 the Upstart one.
7 * debian/apport.upstart: If $force_start=1 is given then run the job.
8+ * debian/local/apport-collect: Don't collect information if bug is a
9+ duplicate. (LP: #471429)
10
11 [ Martin Pitt ]
12 * debian/control: Update Vcs-Bzr: for lucid branch.
13
14=== modified file 'debian/local/apport-collect'
15--- debian/local/apport-collect 2009-10-15 19:12:18 +0000
16+++ debian/local/apport-collect 2009-11-02 23:50:23 +0000
17@@ -108,6 +108,10 @@
18 print 'The bug number %s does not exist in Launchpad.' % bug_number
19 sys.exit(1)
20
21+if bug.duplicate_of:
22+ print 'Duplicate of bug http://launchpad.net/bugs/%d. No information collected.' % crashdb.duplicate_of(bug_number)
23+ sys.exit(1)
24+
25 if bug.owner.name != crashdb.launchpad.me.name:
26 print 'You are not the reporter of bug %s.' % bug_number
27 while True:

Subscribers

People subscribed via source and target branches

to all changes: