diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-12-06 19:34:08 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-12-06 19:34:08 +0100 |
| commit | 4c10eb1a2c54eda92469ffe984e8a56f70f5cf3d (patch) | |
| tree | 74da277692ed78a0edf763ca0c83d4b1ef6558c3 /ftparchive | |
| parent | 773721d74cee9bc7136afc097e479387be7dea7d (diff) | |
| parent | 8076139ead08124e86be5f993baa8a43c22b0137 (diff) | |
* methods/gpgv.cc:
- remove cruft code that caused timestamp/I-M-S issues
* ftparchive/contents.cc:
- fix error output
* methods/mirror.{cc,h}:
- only update mirror list on IndexFile updates
* ftparchive/contents.cc:
- support lzma data members
* ftparchive/multicompress.cc:
- support lzma output
Diffstat (limited to 'ftparchive')
| -rw-r--r-- | ftparchive/contents.cc | 7 | ||||
| -rw-r--r-- | ftparchive/multicompress.cc | 1 |
2 files changed, 7 insertions, 1 deletions
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 /*{{{*/ |