diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2007-07-28 12:25:01 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2007-07-28 12:25:01 -0300 |
commit | ac005224d02d7d993074697f11009ff40f57cb6b (patch) | |
tree | cf05abc197c5b1547a807c3468dc268c5a5f2309 /apt-inst | |
parent | 54c3559f961675e15d0c27cff260eca009bec92c (diff) | |
download | apt-ac005224d02d7d993074697f11009ff40f57cb6b.tar.gz |
* Applied patch from Guillem Jover <guillem.jover@nokia.com> to add
support to add lzma support (closes: #408201)
Diffstat (limited to 'apt-inst')
-rw-r--r-- | apt-inst/deb/debfile.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/apt-inst/deb/debfile.cc b/apt-inst/deb/debfile.cc index 9d83120f8..cd7a88808 100644 --- a/apt-inst/deb/debfile.cc +++ b/apt-inst/deb/debfile.cc @@ -44,8 +44,10 @@ debDebFile::debDebFile(FileFd &File) : File(File), AR(File) 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; } } @@ -130,6 +132,10 @@ bool debDebFile::ExtractArchive(pkgDirStream &Stream) 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) |