diff options
| author | Michael Vogt <mvo@debian.org> | 2008-10-29 09:37:45 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2008-10-29 09:37:45 +0100 |
| commit | ab48734ffcd5ba0aeb858a8401233cffafe188bb (patch) | |
| tree | 95e67079f5aeb096d7558b9e98b795407e7518e6 | |
| parent | 3c8cda8b05d6eeaef76c7ccc673fe378b0c74f37 (diff) | |
| parent | 708ead3a44ac2f5ea625343c5d1b3404cca8a481 (diff) | |
* apt-pkg/acquire-item.cc:
- fix a merge modification (done by me) that prevents the
fallback to the uncompressed 'Packages' to work correctly
| -rw-r--r-- | apt-pkg/acquire-item.cc | 7 | ||||
| -rw-r--r-- | debian/changelog | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 679f9cee7..ae8ff2205 100644 --- 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 0347e83ff..566ed4324 100644 --- 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 |