Просмотр исходного кода

* apt-pkg/deb/dpkgpm.cc:
- filter "ENOMEM" errors when creating apport reports

Michael Vogt лет назад: 17
Родитель
Сommit
3024a85e0c
2 измененных файлов с 13 добавлено и 0 удалено
  1. 6 0
      apt-pkg/deb/dpkgpm.cc
  2. 7 0
      debian/changelog

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

@@ -1027,6 +1027,12 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
       return;
    }
 
+   // do not report out-of-memory failures 
+   if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
+      std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
+      return;
+   }
+
    // get the pkgname and reportfile
    pkgname = flNotDir(pkgpath);
    pos = pkgname.find('_');

+ 7 - 0
debian/changelog

@@ -1,3 +1,10 @@
+apt (0.7.19ubuntu2) jaunty; urgency=low
+
+  * apt-pkg/deb/dpkgpm.cc:
+    - filter "ENOMEM" errors when creating apport reports 
+
+ --
+
 apt (0.7.19ubuntu1) jaunty; urgency=low
 
   * merge from debian