From 589898ae1e46dc56bc037f502e1c405a3e06ed70 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Oct 2008 09:27:11 +0100 Subject: apt-pkg/acquire-item.cc: fixed my incorrect use of flExtension --- apt-pkg/acquire-item.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg/acquire-item.cc') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 679f9cee7..cf835f5d5 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -711,13 +711,13 @@ 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 == "") + else if(compExt == "Packages" || compExt == "Sources") decompProg = "copy"; else { _error->Error("Unsupported extension: %s", compExt.c_str()); -- cgit v1.2.3-70-g09d2 From 708ead3a44ac2f5ea625343c5d1b3404cca8a481 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Oct 2008 09:31:53 +0100 Subject: apt-pkg/acquire-item.cc: do not hardcode "Packages" or "Sources" in the (generic) acquire-item.cc code --- apt-pkg/acquire-item.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'apt-pkg/acquire-item.cc') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index cf835f5d5..ae8ff2205 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -717,7 +717,8 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, decompProg = "bzip2"; else if(compExt == "gz") decompProg = "gzip"; - else if(compExt == "Packages" || compExt == "Sources") + // 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()); -- cgit v1.2.3-70-g09d2 From 1c8ab7200ec4527cd38d0b4d0ef847452f011915 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Oct 2008 18:58:48 +0100 Subject: add fixme for the future flJustExtension --- apt-pkg/acquire-item.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apt-pkg/acquire-item.cc') diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index ae8ff2205..09ea5da02 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -718,6 +718,10 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash, else if(compExt == "gz") decompProg = "gzip"; // 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 { -- cgit v1.2.3-70-g09d2