* apt-pkg/deb/dpkgpm.cc:

 - do not report errors encountered when decompressing packages

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index f8758ea0a50b162f15ff509351ed84c6db602541..4f2b35a01b6e82c91ef559fc8710713ac197b639 100644 (file)
--- 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 <sys/wait.h>
 #include <signal.h>
 #include <errno.h>

-#include <string.h>

 #include <stdio.h>
 #include <string.h>
 #include <algorithm>
 #include <stdio.h>
 #include <string.h>
 #include <algorithm>


@@ -1366,6 +1365,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
       return;
    }
 
       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;
    // 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 5e1ae933031557c08486b35893a3dc84517957d8..f337f734cac3a1f87c3dcded7d3f5fbc8d28b4c3 100644 (file)
--- 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
 apt (0.8.15.1ubuntu1) oneiric; urgency=low
 
   * merge from debian/sid