summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Zimmerman <mdz@ubuntu.com>2009-08-06 17:44:51 +0100
committerMatt Zimmerman <mdz@ubuntu.com>2009-08-06 17:44:51 +0100
commit076c46e5fe4a0ec150952017650c4cc778dc2fd2 (patch)
treec24d586207aa133b032a6c1f24c63f474c4f6b25
parent056539eeb8eb84cea65c0c15466111b978ee156d (diff)
* 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)
-rw-r--r--apt-pkg/deb/dpkgpm.cc7
-rw-r--r--debian/changelog8
2 files changed, 14 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 4403eaefe..3e23720e0 100644
--- 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 f6c282f42..3d5db8114 100644
--- 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