* apt-pkg/deb/dpkgpm.cc:

  - ignore lzma "Cannot allocate memory" errors, thanks to Brian
    Murray

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 79bea85fe8d51aa739912fa95bbaf256916ea8c7..3e0964b05b8d98ece354f88b53fdfd6560f89f62 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1292,7 +1292,8 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    }
 
    // do not report out-of-memory failures 
-   if(strstr(errormsg, strerror(ENOMEM)) != NULL) {
+   if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
+      strstr(errormsg, "Cannot allocate memory") != NULL) {
       std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
       return;
    }

diff --git a/debian/changelog b/debian/changelog
index 72f36cbd9306e908f8361a75d60ff49a591907fb..40dd30807eef0355afe13d5995da3ca3251f36a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.8.10ubuntu2) UNRELEASED; urgency=low
+
+  * apt-pkg/deb/dpkgpm.cc:
+    - ignore lzma "Cannot allocate memory" errors, thanks to Brian
+      Murray
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 11 Jan 2011 18:26:05 +0100
+
 apt (0.8.10ubuntu1) natty; urgency=low
 
   [ Julian Andres Klode ]