Rev 6224: (jr) If sending a crash through Apport fails report the Apport failure to in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6224 [merge]
revision-id: pqm at pqm.ubuntu.com-20111018133223-ilue5mcvyfipjuap
parent: pqm at pqm.ubuntu.com-20111018114828-zmhk0p4e2jz2nauq
parent: jriddell at canonical.com-20111018115054-mlcfpvfzzfh8ivya
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-10-18 13:32:23 +0000
message:
  (jr) If sending a crash through Apport fails report the Apport failure to
   bzr.log rather than stderr. (Jonathan Riddell, #766735) (Jonathan Riddell)
modified:
  bzrlib/crash.py                crash.py-20090812083334-d6volool4lktdjcx-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/crash.py'
--- a/bzrlib/crash.py	2011-05-20 14:46:02 +0000
+++ b/bzrlib/crash.py	2011-10-18 11:50:54 +0000
@@ -70,13 +70,11 @@
             return
     except ImportError, e:
         trace.mutter("couldn't find apport bug-reporting library: %s" % e)
-        pass
     except Exception, e:
         # this should only happen if apport is installed but it didn't
         # work, eg because of an io error writing the crash file
-        stderr.write("bzr: failed to report crash using apport:\n "
-            "    %r\n" % e)
-        pass
+        trace.mutter("bzr: failed to report crash using apport: %r" % e)
+        trace.log_exception_quietly()
     return report_bug_legacy(exc_info, stderr)
 
 

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-10-18 11:48:28 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-10-18 13:32:23 +0000
@@ -55,6 +55,9 @@
   it usable when creating a custom ``UIFactory`` implementation. (Benoît
   Pierre)
 
+* If sending a crash through Apport fails report the Apport failure to
+  bzr.log rather than stderr. (Jonathan Riddell, #766735)
+
 Documentation
 *************