Sfoglia il codice sorgente

apt-pkg/acquire-item.cc: fixed my incorrect use of flExtension

Michael Vogt 17 anni fa
parent
commit
589898ae1e
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 3 3
      apt-pkg/acquire-item.cc

+ 3 - 3
apt-pkg/acquire-item.cc

@@ -711,13 +711,13 @@ void pkgAcqIndex::Done(string Message,unsigned long Size,string Hash,
    else
    else
       Local = true;
       Local = true;
    
    
-   string compExt = flExtension(URI(Desc.URI).Path);
+   string compExt = flExtension(flNotDir(URI(Desc.URI).Path));
    const char *decompProg;
    const char *decompProg;
    if(compExt == "bz2") 
    if(compExt == "bz2") 
       decompProg = "bzip2";
       decompProg = "bzip2";
-   else if(compExt == ".gz") 
+   else if(compExt == "gz") 
       decompProg = "gzip";
       decompProg = "gzip";
-   else if(compExt == "")
+   else if(compExt == "Packages" || compExt == "Sources")
       decompProg = "copy";
       decompProg = "copy";
    else {
    else {
       _error->Error("Unsupported extension: %s", compExt.c_str());
       _error->Error("Unsupported extension: %s", compExt.c_str());