Merge lp:~jelmer/bzr-builddeb/fix-bz2-repack into lp:bzr-builddeb

[Jelmer Vernooij]

Fix repacking of bz2 tarballs during "bzr merge-upstream".

[lp:~jelmer/bzr-builddeb/fix-bz2-repack]

547. By Jelmer Vernooij on 2011-03-28

Merge support for lazy opening upstream branch.

548. By Jelmer Vernooij on 2011-03-30

Merge --launchpad option to 'bzr merge-upstream'.

549. By Jelmer Vernooij on 2011-03-31

Merge support for using lazy hooks if available.

[Jelmer Vernooij (jelmer)]

Ping!

This still do double repacking of some tarballs but it's the simplest implementation in terms of code. I'd be happy to attack the double repacking as well, but preferably in a separate MP (it already happens at the moment, this just adds another codepath that triggers it).

[James Westby (james-w)]

Hi,

Sorry, I didn't know you were wanting to do this in two branches.

Approving, as it looks ok to me, but I wonder if the force_gz=True will
lead to unexpected results with --v3. Go ahead and land either way.

Thanks,

James

review: Approve

[lp:~jelmer/bzr-builddeb/fix-bz2-repack]

550. By Jelmer Vernooij on 2011-04-18

Fix merge of bz2 upstream tarballs. LP: #737012

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-14 22:28:24 +0000
+++ debian/changelog	2011-03-27 00:30:48 +0000
@@ -1,3 +1,9 @@
+bzr-builddeb (2.7.3) UNRELEASED; urgency=low
+
+  * Fix merge of bz2 upstream tarballs. LP: #737012
+
+ -- Jelmer Vernooij <[e-mail]>  Sun, 27 Mar 2011 01:25:57 +0100
+
 bzr-builddeb (2.7.2) unstable; urgency=high
 
   [ Andrew Mitchell ]
 
=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-26 21:08:36 +0000
+++ tests/test_upstream.py	2011-03-27 00:30:48 +0000
@@ -24,6 +24,8 @@
 
 from base64 import standard_b64encode
 
+import bz2
+import gzip
 import os
 import tarfile
 import zipfile
@@ -616,6 +618,18 @@
         self.assertRaises(PackageVersionNotPresent,
             source.fetch_tarball, "foo", "0.9", "bar")
 
+    def test_fetch_tarball_bz2(self):
+        tar = tarfile.open("foo-1.0.tar.bz2", "w:bz2")
+        tar.close()
+        # verify this is a bzip2 file
+        bz2.BZ2File("foo-1.0.tar.bz2").close()
+        source = TarfileSource("foo-1.0.tar.bz2", "1.0")
+        os.mkdir("bar")
+        self.assertEquals("bar/foo_1.0.orig.tar.gz",
+            source.fetch_tarball("foo", "1.0", "bar"))
+        self.failUnlessExists("bar/foo_1.0.orig.tar.gz")
+        gzip.open("bar/foo_1.0.orig.tar.gz").close()
+
 
 class _MissingUpstreamProvider(UpstreamProvider):
     """For tests"""
 
=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-02-12 01:38:40 +0000
+++ upstream/__init__.py	2011-03-27 00:30:48 +0000
@@ -582,10 +582,8 @@
         if version != self.version:
             raise PackageVersionNotPresent(package, version, self)
         dest_name = tarball_name(package, version)
-        repack_tarball(self.path, dest_name, target_dir=target_dir)
-        target_filename = self._tarball_path(package, version, target_dir)
-        shutil.copy(self.path, target_filename)
-        return target_filename
+        repack_tarball(self.path, dest_name, target_dir=target_dir, force_gz=True)
+        return os.path.join(target_dir, dest_name)
 
     def get_latest_version(self, package, version):
         return self.version