Added instruction how to work around MMap error in MMap error message.

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index eed43825087407ccd989c6e4771357e52c86f0dd..04a45811b63351a5fe00d4d7cd1466fcc88e65de 100644 (file)
--- 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)
    {
    // 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;
    }
 
       return 0;
    }
 


@@ -272,7 +273,8 @@ unsigned long DynamicMMap::WriteString(const char *String,
    // Just in case error check
    if (Result + Len > WorkSpace)
    {
    // 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;
    }   
    
       return 0;
    }   
    

diff --git a/debian/changelog b/debian/changelog
index b196b013ef831057c97fd55d72347471f56beae4..d1ccf8b8fbddcc1b26f2a0c54a733ee1cabe0593 100644 (file)
--- 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)
   * 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
 
 
  -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Wed, 26 Nov 2008 22:06:21 +0200