summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-07-13 14:33:21 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2011-07-13 14:33:21 +0200
commit22ff82ff00da247da37fbaa136f34a9dc020e08b (patch)
tree092d5040af17b22cf4f5d924f2b6ddac018a0b44
parent3b9d1d95b115b3377965abb06ccde835d9796534 (diff)
* apt-pkg/deb/dpkgpm.cc:
- do not report errors encountered when decompressing packages
-rw-r--r--apt-pkg/deb/dpkgpm.cc7
-rw-r--r--debian/changelog7
2 files changed, 13 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index f8758ea0a..4f2b35a01 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -26,7 +26,6 @@
#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
-#include <string.h>
#include <stdio.h>
#include <string.h>
#include <algorithm>
@@ -1366,6 +1365,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
return;
}
+ // do not report errors encountered when decompressing packages
+ if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) {
+ std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
+ return;
+ }
+
// do not report dpkg I/O errors, this is a format string, so we compare
// the prefix and the suffix of the error with the dpkg error message
vector<string> io_errors;
diff --git a/debian/changelog b/debian/changelog
index 5e1ae9330..f337f734c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.8.15.1ubuntu2) UNRELEASED; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - do not report errors encountered when decompressing packages
+
+ -- Brian Murray <brian@ubuntu.com> Tue, 12 Jul 2011 16:05:37 -0700
+
apt (0.8.15.1ubuntu1) oneiric; urgency=low
* merge from debian/sid