merge from the mvo branch

[apt.git] / ftparchive / contents.cc

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 3801995bd3829a40929f34097ae389296c75bd33..fb1438f745bc1192aa026d371714da91e5a23ec7 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -13,7 +13,7 @@
    removing the massive sort time overhead.
    
    By breaking all the pathnames into components and storing them 
-   separately a space savings is realized by not duplicating the string
+   separately a space saving is realized by not duplicating the string
    over and over again. Ultimately this saving is sacrificed to storage of
    the tree structure itself but the tree structure yields a speed gain
    in the sorting and processing. Ultimately it takes about 5 seconds to
@@ -314,7 +314,12 @@ bool ContentsExtract::Read(debDebFile &Deb)
       Compressor = "bzip2";
    }
    if (Member == 0) {
-      _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz");
+      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;
    }