merged r1811 from lp:~donkult/apt/experimenal

[apt.git] / ftparchive / contents.cc

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 4f2b1d163e12ce696a017ea69d67c51243bde925..1f2cbcc3d2ff3ba78c58cb165bcd845665e7a2c5 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -308,11 +308,23 @@ bool ContentsExtract::Read(debDebFile &Deb)
    
    // Get the archive member and positition the file 
    const ARArchive::Member *Member = Deb.GotoMember("data.tar.gz");
    
    // Get the archive member and positition the file 
    const ARArchive::Member *Member = Deb.GotoMember("data.tar.gz");

-   if (Member == 0)
+   const char *Compressor = "gzip";
+   if (Member == 0) {
+      Member = Deb.GotoMember("data.tar.bz2");
+      Compressor = "bzip2";
+   }
+   if (Member == 0) {
+      Member = Deb.GotoMember("data.tar.lzma");
+      Compressor = "lzma";
+   }
+   if (Member == 0) {
+      _error->Error(_("Internal error, could not locate member %s"),
+                   "data.tar.{gz,bz2,lzma}");

       return false;
       return false;

+   }

       
    // Extract it.
       
    // Extract it.

-   ExtractTar Tar(Deb.GetFile(),Member->Size);
+   ExtractTar Tar(Deb.GetFile(),Member->Size,Compressor);

    if (Tar.Go(*this) == false)
       return false;   
    return true;   
    if (Tar.Go(*this) == false)
       return false;   
    return true;