Merge lp:~jelmer/bzr-builddeb/tar-xz into lp:bzr-builddeb

[Jelmer Vernooij]

Replace .tar.lzma with .tar.xz - our toolchain only supports the latter.

Replace .tar.lzma with .tar.xz - our toolchain only supports the latter.

[Jelmer Vernooij (jelmer)]

I think we should do another release and upload to oneiric after this lands.

[Vincent Ladeuil (vila)]

Fine !

This has caused http://package-import.ubuntu.com/status/pleiades.html#2011-09-09%2003:33:07.686923

The package importer on jubany is currently at revno 607 (2 revisions after 2.7.7), do you think any change since then could cause problems there ? Or can I just deploy this patch once it has landed ?

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-08-11 15:55:14 +0000
+++ cmds.py	2011-09-09 15:14:45 +0000
@@ -471,7 +471,7 @@
 
     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, .tar.lzma, .tgz or .zip archive, a directory or a branch. The
+    .tar.bz2, .tar.xz, .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.
@@ -577,8 +577,8 @@
             if v3:
                 if location.endswith(".tar.bz2") or location.endswith(".tbz2"):
                     format = "bz2"
-                elif location.endswith(".tar.lzma"):
-                    format = "lzma"
+                elif location.endswith(".tar.xz"):
+                    format = "xz"
             dest_name = tarball_name(package, version, None, format=format)
             tarball_filename = os.path.join(orig_dir, dest_name)
             try:

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-07 21:50:32 +0000
+++ debian/changelog	2011-09-09 15:14:45 +0000
@@ -1,3 +1,9 @@
+bzr-builddeb (2.7.9) UNRELEASED; urgency=low
+
+  * Support .tar.xz Debian files rather than .tar.lzma.
+
+ -- Jelmer Vernooij <[e-mail]>  Fri, 09 Sep 2011 15:21:22 +0200
+
 bzr-builddeb (2.7.8) unstable; urgency=low
 
   * Improve error message when tag for upstream version can not be

=== modified file 'dh_make.py'
--- dh_make.py	2011-07-16 21:52:11 +0000
+++ dh_make.py	2011-09-09 15:14:45 +0000
@@ -62,8 +62,8 @@
     if use_v3:
         if tarball.endswith(".tar.bz2") or tarball.endswith(".tbz2"):
             format = "bz2"
-        elif tarball.endswith(".tar.lzma"):
-            format = "lzma"
+        elif tarball.endswith(".tar.xz"):
+            format = "xz"
     dest_name = util.tarball_name(package_name, version, None, format=format)
     trace.note("Fetching tarball")
     repack_tarball(tarball, dest_name, target_dir=orig_dir)

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-07-20 14:09:01 +0000
+++ import_dsc.py	2011-09-09 15:14:45 +0000
@@ -1477,7 +1477,7 @@
         for part in self.dsc['files']:
             if (part['name'].endswith(".tar.gz")
                     or part['name'].endswith(".tar.bz2")
-                    or part['name'].endswith(".tar.lzma")):
+                    or part['name'].endswith(".tar.xz")):
                 self.unextracted_debian_md5 = part['md5sum']
 
 
@@ -1521,12 +1521,12 @@
                     part['md5sum']))
             elif (part['name'].endswith(".debian.tar.gz")
                     or part['name'].endswith(".debian.tar.bz2")
-                    or part['name'].endswith(".debian.tar.lzma")):
+                    or part['name'].endswith(".debian.tar.xz")):
                 self.unextracted_debian_md5 = part['md5sum']
         assert self.upstream_tarballs is not None, \
-            "Can't handle non gz|bz2|lzma tarballs yet"
+            "Can't handle non gz|bz2|xz tarballs yet"
         assert self.unextracted_debian_md5 is not None, \
-            "Can't handle non gz|bz2|lzma tarballs yet"
+            "Can't handle non gz|bz2|xz tarballs yet"
 
 
 SOURCE_EXTRACTORS = {}

=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2011-08-31 01:16:19 +0000
+++ tests/test_import_dsc.py	2011-09-09 15:14:45 +0000
@@ -925,7 +925,7 @@
                 "esse cillum dolore eu fugiat nulla pariatur. Excepteur sint "
                 "occaecat cupidatat non proident, sunt in culpa qui officia "
                 "deserunt mollit anim id est laborum.")
-        tar_path = "package_0.1.orig.tar.lzma"
+        tar_path = "package_0.1.orig.tar.xz"
         f = lzma.LZMAFile(tar_path, 'w')
         try:
             tf = tarfile.open(None, 'w', f)
@@ -947,7 +947,7 @@
         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)
+        self.assertTrue('deb-pristine-delta-xz' in rev.properties)
 
     def test_import_package_init_from_other(self):
         self.requireFeature(PristineTarFeature)

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-09-07 20:11:50 +0000
+++ tests/test_upstream.py	2011-09-09 15:14:45 +0000
@@ -224,17 +224,17 @@
             _apt_pkg=apt_pkg)
         self.assertEquals(paths, ["target/apackage_0.2.orig.tar.bz2"])
 
-    def test_apt_provider_right_version_lzma(self):
+    def test_apt_provider_right_version_xz(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")]])
+             [("checksum", 0L, "apackage_0.2.orig.tar.xz", "tar")]])
         apt_pkg = MockAptPkg(sources)
         src = AptSource()
         src._run_apt_source = caller.call
         paths = src.fetch_tarballs("apackage", "0.2", "target",
             _apt_pkg=apt_pkg)
-        self.assertEquals(paths, ["target/apackage_0.2.orig.tar.lzma"])
+        self.assertEquals(paths, ["target/apackage_0.2.orig.tar.xz"])
 
     def test_apt_provider_right_version(self):
         caller = MockAptCaller(work=True)
@@ -746,10 +746,10 @@
         rev.properties["deb-pristine-delta-bz2"] = "1"
         self.assertEquals("bz2", self.source.pristine_tar_format(rev))
 
-    def test_pristine_tar_format_lzma(self):
+    def test_pristine_tar_format_xz(self):
         rev = Revision("myrevid")
-        rev.properties["deb-pristine-delta-lzma"] = "1"
-        self.assertEquals("lzma", self.source.pristine_tar_format(rev))
+        rev.properties["deb-pristine-delta-xz"] = "1"
+        self.assertEquals("xz", self.source.pristine_tar_format(rev))
 
     def test_pristine_tar_format_unknown(self):
         rev = Revision("myrevid")
@@ -836,21 +836,21 @@
         self.assertPathExists("bar/foo_1.0.orig.tar.bz2")
         tarfile.open("bar/foo_1.0.orig.tar.bz2", "r:bz2").close()
 
-    def test_fetch_tarball_lzma(self):
+    def test_fetch_tarball_xz(self):
         self.requireFeature(LzmaFeature)
         import lzma
-        lzma_f = lzma.LZMAFile("foo-1.0.tar.lzma", 'w')
+        lzma_f = lzma.LZMAFile("foo-1.0.tar.xz", '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")
+        source = TarfileSource("foo-1.0.tar.xz", "1.0")
         os.mkdir("bar")
-        self.assertEquals(["bar/foo_1.0.orig.tar.gz"],
+        self.assertEquals(["bar/foo_1.0.orig.tar.xz"],
             source.fetch_tarballs("foo", "1.0", "bar"))
-        self.assertPathExists("bar/foo_1.0.orig.tar.gz")
-        gzip.open("bar/foo_1.0.orig.tar.gz").close()
+        self.assertPathExists("bar/foo_1.0.orig.tar.xz")
+        lzma.LZMAFile("bar/foo_1.0.orig.tar.xz").close()
 
 
 class _MissingUpstreamProvider(UpstreamProvider):

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-08-31 01:16:19 +0000
+++ tests/test_util.py	2011-09-09 15:14:45 +0000
@@ -284,9 +284,9 @@
         self.assertEqual(tarball_name("package", Version("0.1"), None,
                     format='bz2'), "package_0.1.orig.tar.bz2")
         self.assertEqual(tarball_name("package", Version("0.1"), None,
-                    format='lzma'), "package_0.1.orig.tar.lzma")
+                    format='xz'), "package_0.1.orig.tar.xz")
         self.assertEqual(tarball_name("package", Version("0.1"), "la",
-                    format='lzma'), "package_0.1.orig-la.tar.lzma")
+                    format='xz'), "package_0.1.orig-la.tar.xz")
 
 
 class SuiteToDistributionTests(TestCase):
@@ -883,7 +883,7 @@
                 f = gzip.GzipFile(tar_path, "w")
             elif compression == "bz2":
                 f = bz2.BZ2File(tar_path, "w")
-            elif compression == "lzma":
+            elif compression == "xz":
                 import lzma
                 f = lzma.LZMAFile(tar_path, "w")
             else:
@@ -915,9 +915,9 @@
             strip_components=1)
         self.assertEquals(os.listdir("target"), ["README"])
 
-    def test_single_orig_tar_lzma(self):
+    def test_single_orig_tar_xz(self):
         self.requireFeature(LzmaFeature)
-        tar_path = self.create_tarball("package", "0.1", "lzma")
+        tar_path = self.create_tarball("package", "0.1", "xz")
         os.mkdir("target")
         extract_orig_tarballs([(tar_path, None)], "target",
             strip_components=1)

=== modified file 'upstream/pristinetar.py'
--- upstream/pristinetar.py	2011-07-17 13:12:28 +0000
+++ upstream/pristinetar.py	2011-09-09 15:14:45 +0000
@@ -195,8 +195,8 @@
             uuencoded = standard_b64encode(delta)
             if tarball.endswith(".tar.bz2"):
                 revprops["deb-pristine-delta-bz2"] = uuencoded
-            elif tarball.endswith(".tar.lzma"):
-                revprops["deb-pristine-delta-lzma"] = uuencoded
+            elif tarball.endswith(".tar.xz"):
+                revprops["deb-pristine-delta-xz"] = uuencoded
             else:
                 revprops["deb-pristine-delta"] = uuencoded
         if author is not None:
@@ -316,15 +316,15 @@
     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-lzma' in rev.properties)
+                or 'deb-pristine-delta-xz' 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'
+        elif 'deb-pristine-delta-xz' in rev.properties:
+            return 'xz'
         assert self.has_pristine_tar_delta(rev)
         raise AssertionError("Not handled new delta type in "
                 "pristine_tar_format")
@@ -334,8 +334,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']
+        elif 'deb-pristine-delta-xz' in rev.properties:
+            uuencoded = rev.properties['deb-pristine-delta-xz']
         else:
             assert self.has_pristine_tar_delta(rev)
             raise AssertionError("Not handled new delta type in "

=== modified file 'util.py'
--- util.py	2011-07-25 00:14:48 +0000
+++ util.py	2011-09-09 15:14:45 +0000
@@ -216,7 +216,7 @@
     :param version: the upstream version of the package.
     :param component: Component name (None for base)
     :param format: the format for the tarball. If None then 'gz' will be
-         used. You probably want on of 'gz', 'bz2', or 'lzma'.
+         used. You probably want on of 'gz', 'bz2', 'lzma' or 'xz'.
     :return: a string that is the name of the upstream tarball to use.
     """
     if format is None:
@@ -698,7 +698,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"):
+    for ext in (".tar.gz", ".tar.bz2", ".tar.lzma", ".tar.xz"):
         if tarball_filename.endswith(ext):
             base = base[:-len(ext)]
             break
@@ -726,7 +726,8 @@
     tar_args = ["tar"]
     if tarball_filename.endswith(".tar.bz2"):
         tar_args.append('xjf')
-    elif tarball_filename.endswith(".tar.lzma"):
+    elif (tarball_filename.endswith(".tar.lzma") or
+          tarball_filename.endswith(".tar.xz")):
         tar_args.append('xJf')
     else:
         tar_args.append('xzf')