* apt-pkg/acquire-item.cc:

  - fix a merge modification (done by me) that prevents the
    fallback to the uncompressed 'Packages' to work correctly

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 679f9cee7e0850a063872cc22c1c9bae9957d249..ae8ff220594e311bc0909f9a8f50a7cfb5c4e48a 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -711,13 +711,14 @@ 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
+   else if(compExt == flNotDir(URI(Desc.URI).Path))
       decompProg = "copy";
    else {
       _error->Error("Unsupported extension: %s", compExt.c_str());

diff --git a/debian/changelog b/debian/changelog
index 0347e83ffd415fa67cf81ab5341581ac02f968ba..566ed4324fa7380dfee741073cfc389ac5c80a77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.17~exp3) experimental; urgency=low
+
+  * apt-pkg/acquire-item.cc:
+    - fix a merge modification (done by me) that prevents the
+      fallback to the uncompressed 'Packages' to work correctly
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 29 Oct 2008 09:36:24 +0100
+
 apt (0.7.17~exp2) experimental; urgency=low
 
   [ Eugene V. Lyubimkin ]
@@ -11,7 +19,6 @@ apt (0.7.17~exp2) experimental; urgency=low
   [ Michael Vogt ]
   * fix various -Wall warnings
 
-
  -- Michael Vogt <mvo@debian.org>  Tue, 28 Oct 2008 18:06:38 +0100
 
 apt (0.7.17~exp1) experimental; urgency=low