diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-11-30 13:00:15 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-11-30 13:00:15 +0100 |
| commit | 24e135b60082a96776589ddbb2744574ddfb75e6 (patch) | |
| tree | ea20ffedf1761da943e9cbd74e5b3d24e28f1243 | |
| parent | 37bb96cc5991b4e762264a5dcb073bfeb3a48455 (diff) | |
* ftparchive/contents.cc:
- fix error output
* ftparchive/contents.cc:
- support lzma data members
* ftparchive/multicompress.cc:
- support lzma output
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | ftparchive/contents.cc | 7 | ||||
| -rw-r--r-- | ftparchive/multicompress.cc | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 832ee11d4..ca4a9bbe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,13 @@ apt (0.7.10) unstable; urgency=low [ Michael Vogt ] * debian/rules - fix https install location + * ftparchive/contents.cc: + - fix error output + [ Chris Cheney ] + * ftparchive/contents.cc: + - support lzma data members + * ftparchive/multicompress.cc: + - support lzma output -- Michael Vogt <mvo@debian.org> Wed, 28 Nov 2007 17:10:49 +0100 diff --git a/ftparchive/contents.cc b/ftparchive/contents.cc index 3801995bd..1f2cbcc3d 100644 --- a/ftparchive/contents.cc +++ b/ftparchive/contents.cc @@ -314,7 +314,12 @@ bool ContentsExtract::Read(debDebFile &Deb) Compressor = "bzip2"; } if (Member == 0) { - _error->Error(_("Internal error, could not locate member %s"),"data.tar.gz"); + Member = Deb.GotoMember("data.tar.lzma"); + Compressor = "lzma"; + } + if (Member == 0) { + _error->Error(_("Internal error, could not locate member %s"), + "data.tar.{gz,bz2,lzma}"); return false; } diff --git a/ftparchive/multicompress.cc b/ftparchive/multicompress.cc index 935c98877..2fc8efcbf 100644 --- a/ftparchive/multicompress.cc +++ b/ftparchive/multicompress.cc @@ -34,6 +34,7 @@ const MultiCompress::CompType MultiCompress::Compressors[] = {{".","",0,0,0,1}, {"gzip",".gz","gzip","-9n","-d",2}, {"bzip2",".bz2","bzip2","-9","-d",3}, + {"lzma",".lzma","lzma","-9","-d",4}, {}}; // MultiCompress::MultiCompress - Constructor /*{{{*/ |