diff options
| author | Michael Vogt <mvo@debian.org> | 2008-12-02 20:16:41 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2008-12-02 20:16:41 +0100 |
| commit | 8f989911535e3a7e96fe2bb1746c55e072583061 (patch) | |
| tree | 70b12470f3f099497f9b868788cb4b5ec86e4970 | |
| parent | 8071aa806453a3e275576c196d6645051475c894 (diff) | |
| parent | 9f8432087b2b00747292fd2ea4c2df3ea7517eab (diff) | |
* 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)
| -rw-r--r-- | apt-pkg/contrib/mmap.cc | 6 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | doc/examples/sources.list | 2 |
3 files changed, 17 insertions, 3 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 c60050fd4..d1ccf8b8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.7.20~exp2) unstable; urgency=low + + [ Eugene V. Lyubimkin ] + * 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 + apt (0.7.19) unstable; urgency=low [ Eugene V. Lyubimkin ] diff --git a/doc/examples/sources.list b/doc/examples/sources.list index 9af1c3c4c..ef729e203 100644 --- a/doc/examples/sources.list +++ b/doc/examples/sources.list @@ -6,4 +6,4 @@ deb http://security.debian.org stable/updates main contrib non-free # Uncomment if you want the apt-get source function to work #deb-src http://http.us.debian.org/debian stable main contrib non-free -#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free +#deb-src http://security.debian.org stable/updates main contrib non-free |