Browse Source

do not report disk full errors from dpkg via apport

Michael Vogt 18 years ago
parent
commit
2f0d5deabc
2 changed files with 8 additions and 0 deletions
  1. 7 0
      apt-pkg/deb/dpkgpm.cc
  2. 1 0
      debian/changelog

+ 7 - 0
apt-pkg/deb/dpkgpm.cc

@@ -25,6 +25,7 @@
 #include <sys/wait.h>
 #include <signal.h>
 #include <errno.h>
+#include <string.h>
 #include <stdio.h>
 #include <sstream>
 #include <map>
@@ -976,6 +977,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
       return;
    }
 
+   // do not report disk-full failures 
+   if(strstr(errormsg, strerror(ENOSPC)) != NULL) {
+      std::clog << _("No apport report written because the error message indicates a disk full error") << std::endl;
+      return;
+   }
+
    // get the pkgname and reportfile
    pkgname = flNotDir(pkgpath);
    pos = pkgname.find('_');

+ 1 - 0
debian/changelog

@@ -11,6 +11,7 @@ apt (0.7.14ubuntu6) UNRELEASED; urgency=low
   * apt-pkg/deb/dpkgpm.cc:
     - improve the filtering for duplicated apport reports (thanks
       to seb128 for pointing that problem out)
+    - do not report disk full errors from dpkg via apport
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 07 Aug 2008 16:28:05 +0200