Bug#649451: hard-coded gzip-only support in apt-cdrom
On Fri, Nov 25, 2011 at 02:09:25AM +0000, Steve McIntyre wrote:
>On Thu, Nov 24, 2011 at 01:26:44AM +0100, David Kalnischkies wrote:
>>On Wed, Nov 23, 2011 at 17:44, Steve McIntyre <steve@einval.com> wrote:
>>> The main change is that I've factored out the decompressor code in
>>> IndexCopy::CopyPackages() and TranslationsCopy::CopyTranslations()
>>> into a single common function, rather than the current repeated
>>> code. Then I've added support for bzip2 and xz there, by forking and
>>> execing the right decompression tool. I'm not a C++ developer by any
>>> means, as you'll probably tell. :-) You'll definitely want to move
>>> DecompressFile() somewhere else...
>>
>>Thanks! The patch is far from being bad, so don't worry.
>>(beside that it doesn't follow the insane indent style - but is that bad?)
>>
>>I played with it a bit more, but i am running out of time for today:
>>Attached patch should apply on experimental, for sid you need to
>>apply Julians first. It should work (tm), but is completely untested,
>>so it properly doesn't. Interesting is that DecompressFile is only a
>>slightly modified copy of MultiCompress::OpenCompress in ftparchive,
>>so we really want to move it somewhere accessible and your
>>FileFd suggestion seems like an ideal fit, i will try to work on that further.
>
>Cool. :-)
>
>Hmmm. Unless I've managed to mis-apply your patch, I don't think it
>works. The code in DropRepeats is dropping all versions of Packages
>and Sources files, I think. Debug on my test DVD is showing the code
>finding Packages and Packages.gz files, then after DropRepeats I've
>got none.
Scratch that, it's in DropBinaryArch. Maybe a silly mistake here.
--
Steve McIntyre, Cambridge, UK. steve@einval.com
You raise the blade, you make the change... You re-arrange me 'til I'm sane...
Reply to: