* contrib/mmap.cc:

  - clarify "MMap reached size limit" error message, thanks Ivan Masár!

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index b3f29032c4a6397eeda2e47a47d78de2be12afa6..d233e51bc0cc249c0f5adab10bc445cecbb60233 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -392,8 +392,8 @@ unsigned long DynamicMMap::WriteString(const char *String,
    the nearly impossible 4 to grow it before it finally give up: Never say never. */
 bool DynamicMMap::Grow() {
        if (Limit != 0 && WorkSpace >= Limit)
    the nearly impossible 4 to grow it before it finally give up: Never say never. */
 bool DynamicMMap::Grow() {
        if (Limit != 0 && WorkSpace >= Limit)

-               return _error->Error(_("The size of a MMap has already reached the defined limit of %lu bytes,"
-                                      "abort the try to grow the MMap."), Limit);
+               return _error->Error(_("Unable to increase the size of the MMap as the "
+                                      "limit of %lu bytes is already reached."), Limit);

 
        unsigned long const newSize = WorkSpace + 1024*1024;
 
 
        unsigned long const newSize = WorkSpace + 1024*1024;
 

diff --git a/debian/changelog b/debian/changelog
index a328c1e1efd39df1e2babb0afd202125eaecf5ef..8a6424ebc5ac607e0166473663efd26dfa563dce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,15 +10,17 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
     - use the patchfile modification time instead of the one from the
       "old" file - thanks to Philipp Weis for noticing! (Closes: #571541)
   * debian/rules:
     - use the patchfile modification time instead of the one from the
       "old" file - thanks to Philipp Weis for noticing! (Closes: #571541)
   * debian/rules:

-    - remove targets refering to CVS or arch as they are useless
+    - remove targets referring to CVS or arch as they are useless

   * apt-pkg/depcache.cc:
     - be doublesure that the killer query is empty before starting reinstall
   * methods/gpgv.cc:
     - remove the keyrings count limit by using vector magic
   * apt-pkg/depcache.cc:
     - be doublesure that the killer query is empty before starting reinstall
   * methods/gpgv.cc:
     - remove the keyrings count limit by using vector magic

+  * contrib/mmap.cc:
+    - clarify "MMap reached size limit" error message, thanks Ivan Masár!

 
   [ Jari Aalto ]
   * debian/rules:
 
   [ Jari Aalto ]
   * debian/rules:

-    - spell out some less known options to reduce manpage consulation-rate
+    - spell out some less known options to reduce manpage consultation-rate

     - Use POSIX command substitution: $(<command sequence>)
     - Remove EOL whitespace (Closes: #577804)
 
     - Use POSIX command substitution: $(<command sequence>)
     - Remove EOL whitespace (Closes: #577804)