From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 13 Jul 2011 12:33:21 +0000 (+0200)
Subject: * apt-pkg/deb/dpkgpm.cc:
X-Git-Tag: 0.9.13.exp1ubuntu1~166
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/22ff82ff00da247da37fbaa136f34a9dc020e08b?ds=inline;hp=-c

* apt-pkg/deb/dpkgpm.cc:
 - do not report errors encountered when decompressing packages
---

22ff82ff00da247da37fbaa136f34a9dc020e08b
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