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

Proposed by Brian Murray
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apt/block-fsys-tarfile
Merge into: lp:~ubuntu-core-dev/apt/ubuntu
Diff against target: 39 lines (+13/-1)
2 files modified
apt-pkg/deb/dpkgpm.cc (+6/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apt/block-fsys-tarfile
Reviewer Review Type Date Requested Status
Michael Vogt Approve
Ubuntu Core Development Team Pending
Review via email: mp+67769@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt-pkg/deb/dpkgpm.cc'
2--- apt-pkg/deb/dpkgpm.cc 2011-06-28 21:41:29 +0000
3+++ apt-pkg/deb/dpkgpm.cc 2011-07-12 23:41:31 +0000
4@@ -26,7 +26,6 @@
5 #include <sys/wait.h>
6 #include <signal.h>
7 #include <errno.h>
8-#include <string.h>
9 #include <stdio.h>
10 #include <string.h>
11 #include <algorithm>
12@@ -1366,6 +1365,12 @@
13 return;
14 }
15
16+ // do not report errors encountered when decompressing packages
17+ if(strstr(errormsg, "--fsys-tarfile returned error exit status 2") != NULL) {
18+ std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
19+ return;
20+ }
21+
22 // do not report dpkg I/O errors, this is a format string, so we compare
23 // the prefix and the suffix of the error with the dpkg error message
24 vector<string> io_errors;
25
26=== modified file 'debian/changelog'
27--- debian/changelog 2011-06-30 08:27:24 +0000
28+++ debian/changelog 2011-07-12 23:41:31 +0000
29@@ -1,3 +1,10 @@
30+apt (0.8.15.1ubuntu2) oneiric; urgency=low
31+
32+ * apt-pkg/deb/dpkgpm.cc:
33+ - do not report errors encountered when decompressing packages
34+
35+ -- Brian Murray <brian@ubuntu.com> Tue, 12 Jul 2011 16:05:37 -0700
36+
37 apt (0.8.15.1ubuntu1) oneiric; urgency=low
38
39 * merge from debian/sid

Subscribers

People subscribed via source and target branches

to all changes: