summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/dpkgpm.cc3
-rw-r--r--debian/changelog8
2 files changed, 10 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 79bea85fe..3e0964b05 100644
--- 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 72f36cbd9..40dd30807 100644
--- 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 ]