diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-02-22 12:50:47 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-02-22 12:50:47 +0100 |
| commit | bc33e0f0b6b1fdb010dcd4a49a78b827530052aa (patch) | |
| tree | 210d986981e3959b46ddb79744f3a68ea963b689 /apt-inst | |
| parent | 0ff1a4556c0a0fb76ce48e88031eff2b4d613c5e (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
Diffstat (limited to 'apt-inst')
| -rw-r--r-- | apt-inst/deb/debfile.cc | 8 |
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) |