* apt-pkg/deb/dpkgpm.cc:

  - Suppress apport reports on dpkg short reads (these I/O errors are not
    generally indicative of a bug in the packaging)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 4403eaefec0493b106f6b0a08cacc2a35fcc3e45..3e23720e02c3e89cb5987fb2999c0e652b9c4c0d 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1078,6 +1078,13 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
       return;
    }
 
+   // do not report dpkg I/O errors
+   // XXX - this message is localized, but this only matches the English version.  This is better than nothing.
+   if(strstr(errormsg, "short read in buffer_copy (")) {
+      std::clog << _("No apport report written because the error message indicates a dpkg I/O error") << std::endl;
+      return;
+   }
+
    // get the pkgname and reportfile
    pkgname = flNotDir(pkgpath);
    pos = pkgname.find('_');

diff --git a/debian/changelog b/debian/changelog
index f6c282f42d1b035f6cbdc67321f00dde838dded5..3d5db811436ecfcf8c9306d92f146ec392747ef8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,18 @@
 apt (0.7.23ubuntu1) karmic; urgency=low
 
+  [ Michael Vogt ]
   * merged from the debian-sid bzr branch
 
   * cmdline/apt-get.cc:
     - honor APT::Get::Only-Source properly in FindSrc() (thanks to
       Martin Pitt for reporting the problem)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jul 2009 15:27:30 +0200
+  [ Matt Zimmerman ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - Suppress apport reports on dpkg short reads (these I/O errors are not 
+      generally indicative of a bug in the packaging)
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Thu, 06 Aug 2009 16:37:04 +0100
 
 apt (0.7.22) unstable; urgency=low