* ftparchive/contents.cc:

  - remove ExtractArchive codecopy from apt-inst/deb/debfile.cc

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index edd78ad..2b1fded 100644 (file)
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -143,7 +143,7 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
       Compressor = "xz";
    }
    if (Member == 0)
-      return _error->Error(_("Internal error, could not locate member"));   
+      return _error->Error(_("Internal error, could not locate member %s"), "data.tar.{gz,bz2,lzma,xz}");
    if (File.Seek(Member->Start) == false)
       return false;
       

diff --git a/debian/changelog b/debian/changelog
index 64da217..6b2c35b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,10 @@ apt (0.8.11.6) UNRELEASED; urgency=low
     - support download of xz-compressed indexes files
   * apt-pkg/deb/debsrcrecords.cc:
     - support xz-compressed source v3 debian.tar files
+  * ftparchive/contents.cc:
+    - remove ExtractArchive codecopy from apt-inst/deb/debfile.cc
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 18:14:17 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 23 Feb 2011 09:00:51 +0100
 
 apt (0.8.11.5) unstable; urgency=low
 

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index 9e283cf..eadced6 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -36,12 +36,13 @@
 #include "contents.h"
 
 #include <apti18n.h>
+#include <apt-pkg/debfile.h>
 #include <apt-pkg/extracttar.h>
 #include <apt-pkg/error.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>    
+#include <malloc.h>
                                                                        /*}}}*/
 
 // GenContents::~GenContents - Free allocated memory                   /*{{{*/
@@ -305,33 +306,7 @@ void GenContents::DoPrint(FILE *Out,GenContents::Node *Top, char *Buf)
 bool ContentsExtract::Read(debDebFile &Deb)
 {
    Reset();
-   
-   // Get the archive member and positition the file 
-   const ARArchive::Member *Member = Deb.GotoMember("data.tar.gz");
-   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) {
-      Member = Deb.GotoMember("data.tar.xz");
-      Compressor = "xz";
-   }
-   if (Member == 0) {
-      _error->Error(_("Internal error, could not locate member %s"),
-                   "data.tar.{gz,bz2,lzma,xz}");
-      return false;
-   }
-      
-   // Extract it.
-   ExtractTar Tar(Deb.GetFile(),Member->Size,Compressor);
-   if (Tar.Go(*this) == false)
-      return false;   
-   return true;   
+   return Deb.ExtractArchive(*this);
 }
                                                                        /*}}}*/
 // ContentsExtract::DoItem - Extract an item                           /*{{{*/