summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene V. Lyubimkin <jackyf@1501-debian>2008-11-26 22:26:32 +0200
committerEugene V. Lyubimkin <jackyf@1501-debian>2008-11-26 22:26:32 +0200
commit9f8432087b2b00747292fd2ea4c2df3ea7517eab (patch)
tree70b12470f3f099497f9b868788cb4b5ec86e4970
parent23fe51aca558f506b7e44b08bd4620d04dd79d38 (diff)
Added instruction how to work around MMap error in MMap error message.
-rw-r--r--apt-pkg/contrib/mmap.cc6
-rw-r--r--debian/changelog3
2 files changed, 7 insertions, 2 deletions
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index eed438250..04a45811b 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -210,7 +210,8 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
// Just in case error check
if (Result + Size > WorkSpace)
{
- _error->Error(_("Dynamic MMap ran out of room"));
+ _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+ "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
return 0;
}
@@ -272,7 +273,8 @@ unsigned long DynamicMMap::WriteString(const char *String,
// Just in case error check
if (Result + Len > WorkSpace)
{
- _error->Error("Dynamic MMap ran out of room");
+ _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+ "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
return 0;
}
diff --git a/debian/changelog b/debian/changelog
index b196b013e..d1ccf8b8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ apt (0.7.20~exp2) unstable; urgency=low
* doc/examples/sources.list:
- Removed obsolete commented non-us deb-src entry, replaced it with
'deb-src security.debian.org' one. (Closes: #411298)
+ * apt-pkg/contrib/mmap.cc:
+ - Added instruction how to work around MMap error in MMap error message.
+ (Closes: #385674, 436028)
-- Eugene V. Lyubimkin <jackyf.devel@gmail.com> Wed, 26 Nov 2008 22:06:21 +0200