Merge lp:~jelmer/bzr-builddeb/import-dsc-tarball-imports into lp:bzr-builddeb

[Jelmer Vernooij]

Fix importing upstream tarballs from 3.0 (quilt) packages in "bzr import-dsc".

[James Westby (james-w)]

review: Approve

=== modified file 'import_dsc.py'
--- import_dsc.py	2011-07-17 13:32:31 +0000
+++ import_dsc.py	2011-07-20 14:12:39 +0000
@@ -1513,9 +1513,12 @@
                 "0000", "-exec", "chmod", "644", "{}", ";"])
         for part in self.dsc['files']:
             if part['name'].startswith("%s_%s.orig" % (name, str(version.upstream_version))):
-                self.upstream_tarballs.append((os.path.abspath(
-                        os.path.join(osutils.dirname(self.dsc_path),
-                            part['name'])), part['md5sum']))
+                self.upstream_tarballs.append((
+                    os.path.abspath(os.path.join(osutils.dirname(self.dsc_path),
+                                    part['name'])),
+                    component_from_orig_tarball(part['name'], name,
+                        str(version.upstream_version)),
+                    part['md5sum']))
             elif (part['name'].endswith(".debian.tar.gz")
                     or part['name'].endswith(".debian.tar.bz2")
                     or part['name'].endswith(".debian.tar.lzma")):
 
=== modified file 'tests/test_import_dsc.py'
--- tests/test_import_dsc.py	2011-07-17 12:12:25 +0000
+++ tests/test_import_dsc.py	2011-07-20 14:12:39 +0000
@@ -1849,7 +1849,11 @@
                             "README")))
             self.assertFalse(os.path.exists(os.path.join(orig_dir,
                             "debian", "control")))
+            self.assertEquals(1, len(extractor.upstream_tarballs))
+            self.assertEquals(3, len(extractor.upstream_tarballs[0]))
             self.assertTrue(os.path.exists(extractor.upstream_tarballs[0][0]))
+            self.assertIs(None, extractor.upstream_tarballs[0][1])
+            self.assertIsInstance(extractor.upstream_tarballs[0][2], unicode) # md5sum
         finally:
             extractor.cleanup()
 
@@ -1930,7 +1934,11 @@
                             "README")))
             self.assertFalse(os.path.exists(os.path.join(orig_dir,
                             "debian", "control")))
+            self.assertEquals(1, len(extractor.upstream_tarballs))
+            self.assertEquals(3, len(extractor.upstream_tarballs[0]))
             self.assertTrue(os.path.exists(extractor.upstream_tarballs[0][0]))
+            self.assertIs(None, extractor.upstream_tarballs[0][1])
+            self.assertIsInstance(extractor.upstream_tarballs[0][2], unicode) # md5sum
         finally:
             extractor.cleanup()