Merge lp:~brian-murray/aptdaemon/natty-check-if-apport-enabled into lp:~aptdaemon-developers/aptdaemon/ubuntu-natty

[Brian Murray]

[Martin Pitt (pitti)]

Note: Please don't merge this patch, but the one that got committed to trunk: http://bazaar.launchpad.net/~aptdaemon-developers/aptdaemon/main/revision/661

Also, we don't actually need a debian/patches/* thing, a new bzr trunk snapshot should do.

[Martin Pitt (pitti)]

review: Needs Fixing

[Michael Vogt (mvo)]

Thanks Martin! I did a bzr snapshot upload now into natty proposed.

[Michael Vogt (mvo)]

I mark the branch merged (its merged in a slightly different way).

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-16 09:45:59 +0000
+++ debian/changelog	2011-06-15 18:19:33 +0000
@@ -1,3 +1,10 @@
+aptdaemon (0.41+bzr657-0ubuntu1.2) natty-proposed; urgency=low
+
+  * patches/check_if_apport_enabled.patch:
+    - only write crash if apport is enabled (LP: #797847)
+
+ -- Brian Murray <[e-mail]>  Wed, 15 Jun 2011 11:02:46 -0700
+
 aptdaemon (0.41+bzr657-0ubuntu1.1) natty-proposed; urgency=low
 
   * patches/fix_lp_781874.patch:

=== added file 'debian/patches/check_if_apport_enabled.patch'
--- debian/patches/check_if_apport_enabled.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/check_if_apport_enabled.patch	2011-06-15 18:19:33 +0000
@@ -0,0 +1,11 @@
+--- aptdaemon/crash.py	2011-01-25 04:46:52 +0000
++++ aptdaemon/crash.py	2011-06-15 16:44:46 +0000
+@@ -93,6 +93,7 @@
+ 
+ if __name__ == "__main__":
+     apt_pkg.init_config()
+-    create_report()
++    if apport.packaging.enabled():
++        create_report()
+ 
+ # vim:ts=4:sw=4:et

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-05-16 09:45:59 +0000
+++ debian/patches/series	2011-06-15 18:19:33 +0000
@@ -1,2 +1,3 @@
 02_fix_crash_on_dpkg_disappear.patch
 fix_lp_781874.patch
+check_if_apport_enabled.patch