* Add missing dot in French translation of manpages. Merci, Olivier

[apt.git] / apt-inst / deb / debfile.cc

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index 84906ff56bc22f1ea8168a32226c3e3a35f6ae26..cd7a888081f1155fd4a4429f7ce37dacf24f92ff 100644 (file)
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -16,10 +16,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/debfile.h"
-#endif
-

 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>


@@ -48,8 +44,10 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File)
       return;
    }
 
       return;
    }
 

-   if (!CheckMember("data.tar.gz") && !CheckMember("data.tar.bz2")) {
-      _error->Error(_("This is not a valid DEB archive, it has no '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2");
+   if (!CheckMember("data.tar.gz") &&
+       !CheckMember("data.tar.bz2") &&
+       !CheckMember("data.tar.lzma")) {
+      _error->Error(_("This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"), "data.tar.gz", "data.tar.bz2", "data.tar.lzma");

       return;
    }
 }
       return;
    }
 }


@@ -134,6 +132,10 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
       Member = AR.FindMember("data.tar.bz2");
       Compressor = "bzip2";
    }
       Member = AR.FindMember("data.tar.bz2");
       Compressor = "bzip2";
    }

+   if (Member == 0) {
+      Member = AR.FindMember("data.tar.lzma");
+      Compressor = "lzma";
+   }

    if (Member == 0)
       return _error->Error(_("Internal error, could not locate member"));   
    if (File.Seek(Member->Start) == false)
    if (Member == 0)
       return _error->Error(_("Internal error, could not locate member"));   
    if (File.Seek(Member->Start) == false)