summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-02-22 15:05:01 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-02-22 15:05:01 +0100
commitb7080ced608f012aee2566afc724c3727e75fc1b (patch)
tree6915540ec50b855f471ad56d8571f25c5a5fddb2 /apt-inst
parent3c54407f8783d5e27363eabf41dbc3d031526ffe (diff)
parentcd5b597cc855a535b35e88324191931c54c6fba0 (diff)
* 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 * ftparchive/writer.cc: - include xz-compressed Packages and Sources files in Release file
Diffstat (limited to 'apt-inst')
-rw-r--r--apt-inst/deb/debfile.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc
index cd7a88808..edd78adbb 100644
--- 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)