bzr-builddeb

Merge lp://staging/~jelmer/bzr-builddeb/lzma into lp://staging/bzr-builddeb

lzma
Merge into trunk

Proposed by Jelmer Vernooij on 2011-06-24

Status:

Merged

Merged at revision:

579

Proposed branch:

lp://staging/~jelmer/bzr-builddeb/lzma

Merge into:

lp://staging/bzr-builddeb

Diff against target:

606 lines (+197/-58)

14 files modified

cmds.py (+4/-2)
debian/changelog (+2/-1)
dh_make.py (+2/-0)
import_dsc.py (+6/-4)
repack_tarball.py (+31/-7)
tests/__init__.py (+35/-30)
tests/test_import_dsc.py (+35/-0)
tests/test_repack_tarball.py (+1/-1)
tests/test_repack_tarball_extra.py (+6/-6)
tests/test_upstream.py (+35/-0)
tests/test_util.py (+27/-4)
upstream/__init__.py (+2/-1)
upstream/pristinetar.py (+8/-1)
util.py (+3/-1)

To merge this branch:

bzr merge lp://staging/~jelmer/bzr-builddeb/lzma

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
James Westby		2011-06-24	Approve on 2011-06-27
Review via email: mp+65802@code.staging.launchpad.net

Description of the change

Add support for .tar.lzma orig tarballs and support for lzma/xz compressed tarballs in general.

This also removes RepackTarballAdaptor which is unused, and replaced by scenarios in load_tests().

pristine-tar doesn't support lzma yet (bug 801588), so it will currently just ship a copy of the entire tarball when it encounters a lzma tarball. That might be problematic in some cases (say, openoffice as a .tar.xz), so we may want to raise PristineTarError if it complains about generating a full-size delta, or perhaps if the delta hits a particular size. What do you think?

lp://staging/~jelmer/bzr-builddeb/lzma updated on 2011-06-24

583. By Jelmer Vernooij on 2011-06-24: remove unused imports.
584. By Jelmer Vernooij on 2011-06-24: Require lzma feature for lzma-dependent tests.

Revision history for this message

James Westby (james-w) wrote on 2011-06-27:

This looks ok to me. Is lzma supported by dak yet?

I'm not sure about the delta questions, storing the full delta is certainly painful,
but if this is supported in dak then we'll have to support it in bzr-builddeb soon,
and that is certainly an easy way to do it.

It's also something we could transition away from easily given that newer pristine-tar
will still deal with the full-size deltas.

My only pause is that as you say an openoffice.tar.xz would be painful, and large
packages are the ones most likely to use lzma.

Thanks,

James

review: Approve

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2011-06-28:

Hi James

On 27/06/11 21:11, James Westby wrote:
> This looks ok to me. Is lzma supported by dak yet?
I don't think it is yet, but it (still) seems like it will be in the
near future.
>
> I'm not sure about the delta questions, storing the full delta is certainly painful,
> but if this is supported in dak then we'll have to support it in bzr-builddeb soon,
> and that is certainly an easy way to do it.
>
> It's also something we could transition away from easily given that newer pristine-tar
> will still deal with the full-size deltas.
>
> My only pause is that as you say an openoffice.tar.xz would be painful, and large
> packages are the ones most likely to use lzma.
>
I'll see if I can spend some time adding lzma support to pristine-tar.