From e3ac3b464d4b084c524076c7e2ab2c737ccdb99c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 13 May 2010 15:20:07 +0200 Subject: [PATCH] =?utf8?q?*=20contrib/mmap.cc:=20=20=20-=20clarify=20"MMap?= =?utf8?q?=20reached=20size=20limit"=20error=20message,=20thanks=20Ivan=20?= =?utf8?q?Mas=C3=A1r!?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- apt-pkg/contrib/mmap.cc | 4 ++-- debian/changelog | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index b3f29032c..d233e51bc 100644 --- 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) - 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; diff --git a/debian/changelog b/debian/changelog index a328c1e1e..8a6424ebc 100644 --- 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: - - 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 + * contrib/mmap.cc: + - clarify "MMap reached size limit" error message, thanks Ivan Masár! [ 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: $() - Remove EOL whitespace (Closes: #577804) -- 2.45.2