Merge lp:~brian-murray/ubuntu/oneiric/apt/block-fsys-tarfile into lp:~ubuntu-core-dev/apt/ubuntu

[Brian Murray]

Remove redundant string include and block reports with an fsys-tarfile error message.

[Michael Vogt (mvo)]

Thanks a bunch! Merged into lp:~ubuntu-core-dev/apt/ubuntu now.

review: Approve

=== modified file 'apt-pkg/deb/dpkgpm.cc'
--- apt-pkg/deb/dpkgpm.cc	2011-06-28 21:41:29 +0000
+++ apt-pkg/deb/dpkgpm.cc	2011-07-12 23:41:31 +0000
@@ -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 @@
       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;

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-30 08:27:24 +0000
+++ debian/changelog	2011-07-12 23:41:31 +0000
@@ -1,3 +1,10 @@
+apt (0.8.15.1ubuntu2) oneiric; urgency=low
+
+  * apt-pkg/deb/dpkgpm.cc:
+   - do not report errors encountered when decompressing packages
+
+ -- Brian Murray <[e-mail]>  Tue, 12 Jul 2011 16:05:37 -0700
+
 apt (0.8.15.1ubuntu1) oneiric; urgency=low
 
   * merge from debian/sid