Просмотр исходного кода

* 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)

Michael Vogt лет назад: 17
Родитель
Сommit
8f98991153
3 измененных файлов с 17 добавлено и 3 удалено
  1. 4 2
      apt-pkg/contrib/mmap.cc
  2. 12 0
      debian/changelog
  3. 1 1
      doc/examples/sources.list

+ 4 - 2
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;
    }   
    

+ 12 - 0
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 ]

+ 1 - 1
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