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 | |
| parent | 54c3559f961675e15d0c27cff260eca009bec92c (diff) | |
* Applied patch from Guillem Jover <guillem.jover@nokia.com> to add
support to add lzma support (closes: #408201)
| -rw-r--r-- | apt-inst/deb/debfile.cc | 10 | ||||
| -rw-r--r-- | apt-pkg/deb/debsrcrecords.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 11 insertions, 3 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) diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index fcd9bb901..ace4e00b5 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -137,7 +137,7 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List) break; F.Type = string(F.Path,Tmp+1,Pos-Tmp); - if (F.Type == "gz" || F.Type == "bz2") + if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma") { Pos = Tmp-1; continue; diff --git a/debian/changelog b/debian/changelog index 8961a0257..7f8d8f0dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ apt (0.7.5) UNRELEASED; urgency=low [ Otavio Salvador ] * Applied patch from Guillem Jover <guillem.jover@nokia.com> to use dpkg-architecture to get the host architecture (closes: #407187) + * Applied patch from Guillem Jover <guillem.jover@nokia.com> to add + support to add lzma support (closes: #408201) [ Michael Vogt ] * apt-pkg/depcache.cc: |