* ftparchive/multicompress.cc, apt-inst/deb/debfile.cc:

  - support xz compressor to create xz-compressed Indexes and be able
    to open data.tar.xz files

diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index cd7a888081f1155fd4a4429f7ce37dacf24f92ff..edd78adbbb10cf95e061a4e3f3f605fc1d2953ba 100644 (file)
--- a/apt-inst/deb/debfile.cc
+++ b/apt-inst/deb/debfile.cc
@@ -46,7 +46,9 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File)
 
    if (!CheckMember("data.tar.gz") &&
        !CheckMember("data.tar.bz2") &&
-       !CheckMember("data.tar.lzma")) {
+       !CheckMember("data.tar.lzma") &&
+       !CheckMember("data.tar.xz")) {
+      // FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
       _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;
    }
@@ -136,6 +138,10 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream)
       Member = AR.FindMember("data.tar.lzma");
       Compressor = "lzma";
    }
+   if (Member == 0) {
+      Member = AR.FindMember("data.tar.xz");
+      Compressor = "xz";
+   }
    if (Member == 0)
       return _error->Error(_("Internal error, could not locate member"));   
    if (File.Seek(Member->Start) == false)

diff --git a/debian/changelog b/debian/changelog
index b3907ac0ffc409ad978101fdf207858839997119..bf72e350d27b523d8cffbc353f8b86d58c066f92 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,11 @@ apt (0.8.10.3+squeeze1) UNRELEASED; urgency=low
   * apt-pkg/contrib/fileutl.cc:
     - reorder the loaded filesize bytes for big endian (Closes: #612986)
       Thanks to Jörg Sommer for the detailed analyse!
+  * ftparchive/multicompress.cc, apt-inst/deb/debfile.cc:
+    - support xz compressor to create xz-compressed Indexes and be able
+      to open data.tar.xz files
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 11:25:58 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 22 Feb 2011 12:47:31 +0100
 
 apt (0.8.10.3) unstable; urgency=low
 

diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc
index b761d9204adb803df418cf5e4e3f17c82ac72a6d..9e283cf3327a7024c7d9baa24b8b78b49b685d08 100644 (file)
--- a/ftparchive/contents.cc
+++ b/ftparchive/contents.cc
@@ -317,9 +317,13 @@ bool ContentsExtract::Read(debDebFile &Deb)
       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}");
+                   "data.tar.{gz,bz2,lzma,xz}");
       return false;
    }
       

diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc
index bb4beedf9c8b994ec9f92bf4d6dccdf88ae5419e..c33414a117bdd2eb48646ac13c51163abd8d3689 100644 (file)
--- a/ftparchive/multicompress.cc
+++ b/ftparchive/multicompress.cc
@@ -35,6 +35,7 @@ const MultiCompress::CompType MultiCompress::Compressors[] =
        {"gzip",".gz","gzip","-9n","-d",2},
        {"bzip2",".bz2","bzip2","-9","-d",3},
        {"lzma",".lzma","lzma","-9","-d",4},
+       {"xz",".xz","xz","-6","-d",5},
        {}};
 
 // MultiCompress::MultiCompress - Constructor                          /*{{{*/

diff --git a/test/integration/framework b/test/integration/framework
index 2422f0886d0770e218a16155609ac0cdf26cc3f4..6545cf3ce4ad08c5f782db95ccc53de3dd4a6b56 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -251,9 +251,9 @@ createaptftparchiveconfig() {
        echo -n '";
 };
 Default {
-       Packages::Compress ". gzip bzip2 lzma";
-       Sources::Compress ". gzip bzip2 lzma";
-       Contents::Compress ". gzip bzip2 lzma";
+       Packages::Compress ". gzip bzip2 lzma xz";
+       Sources::Compress ". gzip bzip2 lzma xz";
+       Contents::Compress ". gzip bzip2 lzma xz";
 };
 TreeDefault {
        Directory "pool/";
@@ -332,6 +332,7 @@ buildaptarchivefromfiles() {
                cat Packages | gzip > Packages.gz
                cat Packages | bzip2 > Packages.bz2
                cat Packages | lzma > Packages.lzma
+               cat Packages | xz > Packages.xz
                msgdone "info"
        fi
        if [ -f Sources ]; then
@@ -339,6 +340,7 @@ buildaptarchivefromfiles() {
                cat Sources | gzip > Sources.gz
                cat Sources | bzip2 > Sources.bz2
                cat Sources | lzma > Sources.lzma
+               cat Sources | xz > Sources.xz
                msgdone "info"
        fi
        msgninfo "\tRelease file… "