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

[Jelmer Vernooij]

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:~jelmer/bzr-builddeb/lzma]

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.

[James Westby (james-w)]

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

[Jelmer Vernooij (jelmer)]

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.

Cheers,

Jelmer

=== modified file 'cmds.py'
--- cmds.py	2011-06-24 10:51:46 +0000
+++ cmds.py	2011-06-24 15:14:30 +0000
@@ -471,8 +471,8 @@
 
     You must supply the source to import from, and in some cases
     the version number of the new release. The source can be a .tar.gz, .tar,
-    .tar.bz2, .tgz or .zip archive, a directory or a branch. The source may
-    also be a remote file described by a URL.
+    .tar.bz2, .tar.lzma, .tgz or .zip archive, a directory or a branch. The
+    source may also be a remote file described by a URL.
 
     In most situations the version can be guessed from the upstream source.
     If the upstream version can not be guessed or if it is guessed
@@ -577,6 +577,8 @@
             if v3:
                 if location.endswith(".tar.bz2") or location.endswith(".tbz2"):
                     format = "bz2"
+                elif location.endswith(".tar.lzma"):
+                    format = "lzma"
             dest_name = tarball_name(package, version, format=format)
             tarball_filename = os.path.join(orig_dir, dest_name)
             try:

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-14 00:32:04 +0000
+++ debian/changelog	2011-06-24 15:14:30 +0000
@@ -15,8 +15,9 @@
     sources.list. LP: #796853
   * Fix deprecation warnings for TestCase.failUnlessExists and
     TestCase.failIfExists in bzr 2.4.
+  * Add support for xz and lzma tarballs. LP: #553668
 
- -- Jelmer Vernooij <[e-mail]>  Mon, 13 Jun 2011 23:10:20 +0100
+ -- Jelmer Vernooij <[e-mail]>  Fri, 24 Jun 2011 16:51:51 +0200
 
 bzr-builddeb (2.7.4) unstable; urgency=low
 

=== modified file 'dh_make.py'
--- dh_make.py	2011-06-23 10:29:54 +0000
+++ dh_make.py	2011-06-24 15:14:30 +0000
@@ -62,6 +62,8 @@
     if use_v3:
         if tarball.endswith(".tar.bz2") or tarball.endswith(".tbz2"):
             format = "bz2"
+        elif tarball.endswith(".tar.lzma"):
+            format = "lzma"
     dest_name = util.tarball_name(package_name, version, format=format)
     trace.note("Fetching tarball")
     repack_tarball(tarball, dest_name, target_dir=orig_dir,

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-06-23 21:34:52 +0000
+++ import_dsc.py	2011-06-24 15:14:30 +0000
@@ -1505,7 +1505,8 @@
         self.extracted_upstream = None
         for part in self.dsc['files']:
             if (part['name'].endswith(".tar.gz")
-                    or part['name'].endswith(".tar.bz2")):
+                    or part['name'].endswith(".tar.bz2")
+                    or part['name'].endswith(".tar.lzma")):
                 self.unextracted_debian_md5 = part['md5sum']
 
 
@@ -1545,12 +1546,13 @@
                         os.path.join(osutils.dirname(self.dsc_path),
                             part['name'])), part['md5sum']))
             elif (part['name'].endswith(".debian.tar.gz")
-                    or part['name'].endswith(".debian.tar.bz2")):
+                    or part['name'].endswith(".debian.tar.bz2")
+                    or part['name'].endswith(".debian.tar.lzma")):
                 self.unextracted_debian_md5 = part['md5sum']
         assert self.upstream_tarballs is not None, \
-            "Can't handle non gz|bz2 tarballs yet"
+            "Can't handle non gz|bz2|lzma tarballs yet"
         assert self.unextracted_debian_md5 is not None, \
-            "Can't handle non gz|bz2 tarballs yet"
+            "Can't handle non gz|bz2|lzma tarballs yet"
 
 
 SOURCE_EXTRACTORS = {}

=== modified file 'repack_tarball.py'
--- repack_tarball.py	2011-06-12 22:30:15 +0000
+++ repack_tarball.py	2011-06-24 15:14:30 +0000
@@ -36,8 +36,9 @@
 import zipfile
 
 from bzrlib.errors import (
-                           FileExists,
-                           )
+    DependencyNotPresent,
+    FileExists,
+    )
 from bzrlib.transport import get_transport
 
 from bzrlib.plugins.builddeb.errors import UnsupportedRepackFormat
@@ -64,8 +65,8 @@
         raise NotImplementedError(self.repack)
 
 
-class TgzTgzRepacker(TgzRepacker):
-    """A TgzRepacker that just copies."""
+class CopyRepacker(TgzRepacker):
+    """A Repacker that just copies."""
 
     def repack(self, target_f):
         shutil.copyfileobj(self.source_f, target_f)
@@ -94,6 +95,22 @@
             gz.close()
 
 
+class TarLzma2TgzRepacker(TgzRepacker):
+    """A TgzRepacker that repacks from a .tar.lzma or .tar.xz."""
+
+    def repack(self, target_f):
+        try:
+            import lzma
+        except ImportError, e:
+            raise DependencyNotPresent('lzma', e)
+        content = lzma.decompress(self.source_f.read())
+        gz = gzip.GzipFile(mode='w', fileobj=target_f)
+        try:
+            gz.write(content)
+        finally:
+            gz.close()
+
+
 class ZipTgzRepacker(TgzRepacker):
     """A TgzRepacker that repacks from a .zip file."""
 
@@ -124,7 +141,8 @@
 
 
 def get_filetype(filename):
-    types = [".tar.gz", ".tgz", ".tar.bz2", ".tbz2", ".tar", ".zip"]
+    types = [".tar.gz", ".tgz", ".tar.bz2", ".tar.xz", ".tar.lzma", ".tbz2",
+             ".tar", ".zip"]
     for filetype in types:
         if filename.endswith(filetype):
             return filetype
@@ -134,11 +152,17 @@
     """Return the appropriate repacker based on the file extension."""
     filetype = get_filetype(source_filename)
     if (filetype == ".tar.gz" or filetype == ".tgz"):
-        return TgzTgzRepacker
+        return CopyRepacker
     if (filetype == ".tar.bz2" or filetype == ".tbz2"):
         if force_gz:
             return Tbz2TgzRepacker
-        return TgzTgzRepacker
+        return CopyRepacker
+    if filetype == ".tar.lzma":
+        if force_gz:
+            return TarLzma2TgzRepacker
+        return CopyRepacker
+    if filetype == ".tar.xz":
+        return TarLzma2TgzRepacker
     if filetype == ".tar":
         return TarTgzRepacker
     if filetype == ".zip":

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2011-06-13 23:01:14 +0000
+++ tests/__init__.py	2011-06-24 15:14:30 +0000
@@ -23,10 +23,8 @@
 import tarfile
 import zipfile
 
-from copy import deepcopy
 import doctest
 import os
-from unittest import TestSuite
 
 from bzrlib import tests
 
@@ -36,7 +34,7 @@
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version, Changelog
 
-from bzrlib.tests import TestUtil, multiply_tests
+from bzrlib.tests import TestUtil, multiply_tests, ModuleAvailableFeature
 
 
 def make_new_upstream_dir(source, dest):
@@ -84,33 +82,31 @@
     shutil.rmtree(source)
 
 
-tarball_functions = [('dir', make_new_upstream_dir, '../package-0.2'),
-                     ('.tar.gz', make_new_upstream_tarball,
-                      '../package-0.2.tar.gz'),
-                     ('.tar.bz2', make_new_upstream_tarball_bz2,
-                      '../package-0.2.tar.bz2'),
-                     ('.zip', make_new_upstream_tarball_zip,
-                      '../package-0.2.zip'),
-                     ('.tar', make_new_upstream_tarball_bare,
-                      '../package-0.2.tar'),
-                     ]
-
-
-class RepackTarballAdaptor(object):
-
-    def adapt(self, test):
-        result = TestSuite()
-        for (name, function, source) in tarball_functions:
-            new_test = deepcopy(test)
-            source = os.path.basename(source)
-            new_test.build_tarball = function(source)
-            new_test.old_tarball = source
-            def make_new_id():
-                new_id = '%s(%s)' % (test.id(), name)
-                return lambda: new_id
-            new_test.id = make_new_id()
-            result.addTest(new_test)
-        return result
+def make_new_upstream_tarball_xz(source, dest):
+    import lzma
+    f = lzma.LZMAFile(dest, 'w')
+    try:
+        tar = tarfile.open(None, 'w', f)
+        try:
+            tar.add(source)
+        finally:
+            tar.close()
+    finally:
+        f.close()
+    shutil.rmtree(source)
+
+def make_new_upstream_tarball_lzma(source, dest):
+    import lzma
+    f = lzma.LZMAFile(dest, 'w', options={'format': 'alone'})
+    try:
+        tar = tarfile.open(None, 'w', f)
+        try:
+            tar.add(source)
+        finally:
+            tar.close()
+    finally:
+        f.close()
+    shutil.rmtree(source)
 
 
 def load_tests(standard_tests, module, loader):
@@ -151,6 +147,12 @@
                               old_tarball='../package-0.2.tar.gz')),
                  ('.tar.bz2', dict(build_tarball=make_new_upstream_tarball_bz2,
                               old_tarball='../package-0.2.tar.bz2')),
+                 ('.tar.xz', dict(build_tarball=make_new_upstream_tarball_xz,
+                              old_tarball='../package-0.2.tar.xz',
+                              _test_needs_features=[LzmaFeature])),
+                 ('.tar.lzma', dict(build_tarball=make_new_upstream_tarball_lzma,
+                              old_tarball='../package-0.2.tar.lzma',
+                              _test_needs_features=[LzmaFeature])),
                  ('.zip', dict(build_tarball=make_new_upstream_tarball_zip,
                               old_tarball='../package-0.2.zip')),
                  ('.tar', dict(build_tarball=make_new_upstream_tarball_bare,
@@ -435,3 +437,6 @@
         assert ret == 0, "dpkg-genchanges failed, output:\n%s" % \
                 (proc.stdout.read(),)
         shutil.rmtree(basedir)
+
+
+LzmaFeature = ModuleAvailableFeature("lzma")

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2011-06-23 15:33:44 +0000
+++ tests/test_import_dsc.py	2011-06-24 15:14:30 +0000
@@ -45,6 +45,7 @@
         )
 from bzrlib.plugins.builddeb.tests import (
         BuilddebTestCase,
+        LzmaFeature,
         SourcePackageBuilder,
         )
 
@@ -889,6 +890,40 @@
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
         self.assertTrue('deb-pristine-delta-bz2' in rev.properties)
 
+    def test_import_upstream_with_lzma_tarball(self):
+        self.requireFeature(PristineTarFeature)
+        self.requireFeature(LzmaFeature)
+        import lzma
+        version = Version("0.1-1")
+        name = "package"
+        basedir = name + "-" + str(version.upstream_version)
+        os.mkdir(basedir)
+        write_to_file(os.path.join(basedir, "README"), "Hi\n")
+        write_to_file(os.path.join(basedir, "BUGS"), "")
+        tar_path = "package_0.1.orig.tar.lzma"
+        f = lzma.LZMAFile(tar_path, 'w')
+        try:
+            tf = tarfile.open(None, 'w', f)
+            try:
+                tf.add(basedir)
+            finally:
+                tf.close()
+        finally:
+            f.close()
+        self.db1.import_upstream(basedir, "package", version.upstream_version,
+            [], upstream_tarballs=[(os.path.abspath(tar_path), None, self.fake_md5_1)])
+        tree = self.up_tree1
+        branch = tree.branch
+        rh = branch.revision_history()
+        self.assertEqual(len(rh), 1)
+        self.assertEqual(self.db1.revid_of_upstream_version(
+            "package", version.upstream_version), rh[0])
+        rev = branch.repository.get_revision(rh[0])
+        self.assertEqual(rev.message,
+                "Import upstream version %s" % str(version.upstream_version))
+        self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
+        self.assertTrue('deb-pristine-delta-lzma' in rev.properties)
+
     def test_import_package_init_from_other(self):
         self.requireFeature(PristineTarFeature)
         version1 = Version("0.1-1")

=== modified file 'tests/test_repack_tarball.py'
--- tests/test_repack_tarball.py	2011-06-13 23:01:14 +0000
+++ tests/test_repack_tarball.py	2011-06-24 15:14:30 +0000
@@ -1,6 +1,6 @@
 #    test_repack_tarball.py -- Testsuite for repacking of tarballs
 #    Copyright (C) 2007 James Westby <[e-mail]>
-#    
+#
 #    This file is part of bzr-builddeb.
 #
 #    bzr-builddeb is free software; you can redistribute it and/or modify

=== modified file 'tests/test_repack_tarball_extra.py'
--- tests/test_repack_tarball_extra.py	2011-06-13 23:01:14 +0000
+++ tests/test_repack_tarball_extra.py	2011-06-24 15:14:30 +0000
@@ -48,7 +48,7 @@
             touch(filename)
 
 
-def make_new_upstream_tarball(tarball):
+def make_new_upstream_tarball_gz(tarball):
     tar = tarfile.open(tarball, 'w:gz')
     try:
         tar.add('package-0.2')
@@ -79,11 +79,11 @@
     def test_conditional_repack_tarball_different(self):
         tarball_name = 'package-0.2.tar.gz'
         create_basedir('package-0.2/', files=['README'])
-        make_new_upstream_tarball(tarball_name)
+        make_new_upstream_tarball_gz(tarball_name)
         target_dir = 'target'
         os.mkdir(target_dir)
         create_basedir('package-0.2/', files=['README', 'NEWS'])
-        make_new_upstream_tarball(os.path.join(target_dir, tarball_name))
+        make_new_upstream_tarball_gz(os.path.join(target_dir, tarball_name))
         self.assertRaises(FileExists, repack_tarball, tarball_name,
             tarball_name, target_dir=target_dir)
         self.assertPathExists(tarball_name)
@@ -92,7 +92,7 @@
     def test_conditional_repack_tarball_same(self):
         tarball_name = 'package-0.2.tar.gz'
         create_basedir('package-0.2/', files=['README'])
-        make_new_upstream_tarball(tarball_name)
+        make_new_upstream_tarball_gz(tarball_name)
         target_dir = 'target'
         os.mkdir(target_dir)
         shutil.copy(tarball_name, target_dir)
@@ -108,7 +108,7 @@
         target_dir = 'target'
         os.mkdir(target_dir)
         create_basedir('package-0.2/', files=['README'])
-        make_new_upstream_tarball(os.path.join(target_dir, tarball_name))
+        make_new_upstream_tarball_gz(os.path.join(target_dir, tarball_name))
         self.assertRaises(FileExists, repack_tarball, bz2_tarball_name,
             tarball_name, target_dir=target_dir)
         self.assertPathExists(bz2_tarball_name)
@@ -129,7 +129,7 @@
         target_dir = 'target'
         os.mkdir(target_dir)
         create_basedir('package-0.2/', files=['COPYING'])
-        make_new_upstream_tarball(os.path.join(target_dir, bz2_tarball_name))
+        make_new_upstream_tarball_gz(os.path.join(target_dir, bz2_tarball_name))
         self.assertRaises(FileExists, repack_tarball, bz2_tarball_name,
             bz2_tarball_name, target_dir=target_dir)
         self.assertPathExists(bz2_tarball_name)

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-06-15 18:44:09 +0000
+++ tests/test_upstream.py	2011-06-24 15:14:30 +0000
@@ -35,6 +35,7 @@
     )
 from bzrlib.tests import (
     Feature,
+    KnownFailure,
     TestCase,
     )
 from bzrlib.plugins.builddeb.config import (
@@ -46,6 +47,7 @@
     WatchFileMissing,
     )
 from bzrlib.plugins.builddeb.tests import (
+    LzmaFeature,
     TestCaseWithTransport,
     )
 from bzrlib.plugins.builddeb.upstream import (
@@ -216,6 +218,18 @@
             _apt_pkg=apt_pkg)
         self.assertEquals(paths, ["target/apackage_0.2.orig.tar.bz2"])
 
+    def test_apt_provider_right_version_lzma(self):
+        caller = MockAptCaller(work=True)
+        sources = MockSources(["0.1-1", "0.2-1"],
+            [[("checksum", 0L, "apackage_0.1.orig.tar.gz", "tar")],
+             [("checksum", 0L, "apackage_0.2.orig.tar.lzma", "tar")]])
+        apt_pkg = MockAptPkg(sources)
+        src = AptSource()
+        src._run_apt_source = caller.call
+        paths = src.fetch_tarball("apackage", "0.2", "target",
+            _apt_pkg=apt_pkg)
+        self.assertEquals(paths, ["target/apackage_0.2.orig.tar.lzma"])
+
     def test_apt_provider_right_version(self):
         caller = MockAptCaller(work=True)
         sources = MockSources(["0.1-1", "0.2-1"],
@@ -693,6 +707,11 @@
         rev.properties["deb-pristine-delta-bz2"] = "1"
         self.assertEquals("bz2", self.source.pristine_tar_format(rev))
 
+    def test_pristine_tar_format_lzma(self):
+        rev = Revision("myrevid")
+        rev.properties["deb-pristine-delta-lzma"] = "1"
+        self.assertEquals("lzma", self.source.pristine_tar_format(rev))
+
     def test_pristine_tar_format_unknown(self):
         rev = Revision("myrevid")
         self.assertRaises(AssertionError,
@@ -769,6 +788,22 @@
         self.assertPathExists("bar/foo_1.0.orig.tar.gz")
         gzip.open("bar/foo_1.0.orig.tar.gz").close()
 
+    def test_fetch_tarball_lzma(self):
+        self.requireFeature(LzmaFeature)
+        import lzma
+        lzma_f = lzma.LZMAFile("foo-1.0.tar.lzma", 'w')
+        try:
+            tar = tarfile.open("foo-1.0.tar", "w", lzma_f)
+            tar.close()
+        finally:
+            lzma_f.close()
+        source = TarfileSource("foo-1.0.tar.lzma", "1.0")
+        os.mkdir("bar")
+        self.assertEquals(["bar/foo_1.0.orig.tar.gz"],
+            source.fetch_tarball("foo", "1.0", "bar"))
+        self.assertPathExists("bar/foo_1.0.orig.tar.gz")
+        gzip.open("bar/foo_1.0.orig.tar.gz").close()
+
 
 class _MissingUpstreamProvider(UpstreamProvider):
     """For tests"""

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-06-16 11:11:36 +0000
+++ tests/test_util.py	2011-06-24 15:14:30 +0000
@@ -18,6 +18,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
+import bz2
+import gzip
 try:
     import hashlib as md5
 except ImportError:
@@ -33,7 +35,6 @@
     from debian_bundle.changelog import Changelog, Version
 
 from bzrlib.plugins.builddeb.config import (
-    DebBuildConfig,
     BUILD_TYPE_MERGE,
     BUILD_TYPE_NATIVE,
     BUILD_TYPE_NORMAL,
@@ -45,6 +46,7 @@
     NoPreviousUpload,
     )
 from bzrlib.plugins.builddeb.tests import (
+    LzmaFeature,
     SourcePackageBuilder,
     TestCaseInTempDir,
     TestCaseWithTransport,
@@ -858,11 +860,24 @@
             if part is not None:
                 prefix += "-%s" % part
             tar_path = os.path.abspath(prefix + ".tar." + compression)
-            tf = tarfile.open(tar_path, 'w:%s' % compression)
+            if compression == "gz":
+                f = gzip.GzipFile(tar_path, "w")
+            elif compression == "bz2":
+                f = bz2.BZ2File(tar_path, "w")
+            elif compression == "lzma":
+                import lzma
+                f = lzma.LZMAFile(tar_path, "w")
+            else:
+                raise AssertionError("Unknown compressin type %r" %
+                    compression)
             try:
-                tf.add(basedir)
+                tf = tarfile.open(None, 'w', f)
+                try:
+                    tf.add(basedir)
+                finally:
+                    tf.close()
             finally:
-                tf.close()
+                f.close()
         finally:
             shutil.rmtree(basedir)
         return tar_path
@@ -881,6 +896,14 @@
             strip_components=1)
         self.assertEquals(os.listdir("target"), ["README"])
 
+    def test_single_orig_tar_lzma(self):
+        self.requireFeature(LzmaFeature)
+        tar_path = self.create_tarball("package", "0.1", "lzma")
+        os.mkdir("target")
+        extract_orig_tarballs([(tar_path, None)], "target",
+            strip_components=1)
+        self.assertEquals(os.listdir("target"), ["README"])
+
     def test_multiple_tarballs(self):
         base_tar_path = self.create_tarball("package", "0.1", "bz2")
         tar_path_extra = self.create_tarball("package", "0.1", "bz2", part="extra")

=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-06-17 01:37:55 +0000
+++ upstream/__init__.py	2011-06-24 15:14:30 +0000
@@ -451,7 +451,8 @@
     :param packagename: Name of the package (e.g. "bzr-builddeb")
     """
     basename = os.path.basename(path)
-    for extension in [".tar.gz", ".tgz", ".tar.bz2", ".zip"]:
+    for extension in [".tar.gz", ".tgz", ".tar.bz2", ".tar.lzma", ".tar.xz",
+            ".zip"]:
         if basename.endswith(extension):
             basename = basename[:-len(extension)]
             break

=== modified file 'upstream/pristinetar.py'
--- upstream/pristinetar.py	2011-06-23 21:41:36 +0000
+++ upstream/pristinetar.py	2011-06-24 15:14:30 +0000
@@ -249,13 +249,16 @@
 
     def has_pristine_tar_delta(self, rev):
         return ('deb-pristine-delta' in rev.properties
-                or 'deb-pristine-delta-bz2' in rev.properties)
+                or 'deb-pristine-delta-bz2' in rev.properties
+                or 'deb-pristine-delta-lzma' in rev.properties)
 
     def pristine_tar_format(self, rev):
         if 'deb-pristine-delta' in rev.properties:
             return 'gz'
         elif 'deb-pristine-delta-bz2' in rev.properties:
             return 'bz2'
+        elif 'deb-pristine-delta-lzma' in rev.properties:
+            return 'lzma'
         assert self.has_pristine_tar_delta(rev)
         raise AssertionError("Not handled new delta type in "
                 "pristine_tar_format")
@@ -265,6 +268,8 @@
             uuencoded = rev.properties['deb-pristine-delta']
         elif 'deb-pristine-delta-bz2' in rev.properties:
             uuencoded = rev.properties['deb-pristine-delta-bz2']
+        elif 'deb-pristine-delta-lzma' in rev.properties:
+            uuencoded = rev.properties['deb-pristine-delta-lzma']
         else:
             assert self.has_pristine_tar_delta(rev)
             raise AssertionError("Not handled new delta type in "
@@ -315,6 +320,8 @@
         uuencoded = standard_b64encode(delta)
         if tarball.endswith(".tar.bz2"):
             ret["deb-pristine-delta-bz2"] = uuencoded
+        elif tarball.endswith(".tar.lzma"):
+            ret["deb-pristine-delta-lzma"] = uuencoded
         else:
             ret["deb-pristine-delta"] = uuencoded
         return ret

=== modified file 'util.py'
--- util.py	2011-06-15 19:09:24 +0000
+++ util.py	2011-06-24 15:14:30 +0000
@@ -692,7 +692,7 @@
             "invalid orig tarball file %s does not have expected prefix %s" % (
                 tarball_filename, prefix))
     base = tarball_filename[len(prefix):]
-    for ext in (".tar.gz", ".tar.bz2", ".tar.lzma", ".tar.xz"):
+    for ext in (".tar.gz", ".tar.bz2", ".tar.lzma"):
         if tarball_filename.endswith(ext):
             base = base[:-len(ext)]
             break
@@ -720,6 +720,8 @@
     tar_args = ["tar"]
     if tarball_filename.endswith(".tar.bz2"):
         tar_args.append('xjf')
+    elif tarball_filename.endswith(".tar.lzma"):
+        tar_args.append('xJf')
     else:
         tar_args.append('xzf')
     if component is not None: