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

[Marco Rodrigues]

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-02 08:37:25 +0000
+++ debian/changelog	2009-11-02 23:50:23 +0000
@@ -4,6 +4,8 @@
   * etc/default/apport: Replace the old init.d force_start command by
     the Upstart one.
   * debian/apport.upstart: If $force_start=1 is given then run the job.
+  * debian/local/apport-collect: Don't collect information if bug is a
+    duplicate. (LP: #471429)
 
   [ Martin Pitt ]
   * debian/control: Update Vcs-Bzr: for lucid branch.
 
=== modified file 'debian/local/apport-collect'
--- debian/local/apport-collect	2009-10-15 19:12:18 +0000
+++ debian/local/apport-collect	2009-11-02 23:50:23 +0000
@@ -108,6 +108,10 @@
     print 'The bug number %s does not exist in Launchpad.' % bug_number
     sys.exit(1)
 
+if bug.duplicate_of:
+    print 'Duplicate of bug http://launchpad.net/bugs/%d. No information collected.' % crashdb.duplicate_of(bug_number)
+    sys.exit(1)
+
 if bug.owner.name != crashdb.launchpad.me.name:
     print 'You are not the reporter of bug %s.' % bug_number
     while True: