merged from the debian-sid branch

2 files changed, 12 insertions, 5 deletions

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 679f9cee7..09ea5da02 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -711,13 +711,18 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
    else
       Local = true;
    
-   string compExt = flExtension(URI(Desc.URI).Path);
+   string compExt = flExtension(flNotDir(URI(Desc.URI).Path));
    const char *decompProg;
    if(compExt == "bz2") 
       decompProg = "bzip2";
-   else if(compExt == ".gz") 
+   else if(compExt == "gz") 
       decompProg = "gzip";
-   else if(compExt == "")
+   // flExtensions returns the full name if no extension is found
+   // this is why we have this complicated compare operation here
+   // FIMXE: add a new flJustExtension() that return "" if no
+   //        extension is found and use that above so that it can
+   //        be tested against ""
+   else if(compExt == flNotDir(URI(Desc.URI).Path))
       decompProg = "copy";
    else {
       _error->Error("Unsupported extension: %s", compExt.c_str());
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;
    }