Merge lp:~jelmer/bzr-builddeb/uscan-print-error into lp:bzr-builddeb

[Jelmer Vernooij]

Print a proper error message when uscan doesn't create the expected orig tarball despite exiting with exit code 0.

[James Westby (james-w)]

The diff needs a cleanup (conflicts, pdb), but the change looks good.

Thanks,

James

review: Approve

[Jelmer Vernooij (jelmer)]

Argh, not sure how that got in there.

Thanks for the review.

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-31 01:40:39 +0000
+++ debian/changelog	2011-09-07 20:13:24 +0000
@@ -2,10 +2,19 @@
 
   * Improve error message when tag for upstream version can not be
     found. LP: #783882
+<<<<<<< TREE
   * Cope with newer versions of bzr raising IOError rather than
     NoSuchFile error. LP: #831351, Closes: #638219
+=======
+  * Print proper error if uscan doesn't create the expected orig
+    tarball. LP: #818093.
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
  -- Jelmer Vernooij <[e-mail]>  Wed, 31 Aug 2011 03:40:12 +0200
+=======
+ -- Jelmer Vernooij <[e-mail]>  Wed, 07 Sep 2011 22:11:47 +0200
+>>>>>>> MERGE-SOURCE
 
 bzr-builddeb (2.7.7) unstable; urgency=low
 

=== modified file 'repack_tarball.py'
--- repack_tarball.py	2011-07-16 21:52:11 +0000
+++ repack_tarball.py	2011-09-07 20:13:24 +0000
@@ -187,6 +187,7 @@
 
 
 def _repack_directory(target_transport, new_name, source_name):
+    import pdb; pdb.set_trace()
     target_transport.ensure_base()
     target_f = target_transport.open_write_stream(new_name)
     try:

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-07-25 13:11:01 +0000
+++ tests/test_upstream.py	2011-09-07 20:13:24 +0000
@@ -60,6 +60,7 @@
     UpstreamSource,
     UScanSource,
     extract_tarball_version,
+    gather_orig_files,
     new_tarball_name,
     )
 from bzrlib.plugins.builddeb.util import (
@@ -921,3 +922,19 @@
     def test_zip(self):
         self.assertEquals("foo_1.0.orig.tar.gz",
             new_tarball_name("foo", "1.0", "bla.zip"))
+
+
+class TestGatherOrigTarballs(TestCaseWithTransport):
+
+    def test_no_dir(self):
+        self.assertIs(None, gather_orig_files("mypkg", "1.0", "idontexist"))
+
+    def test_empty(self):
+        self.build_tree(["empty/"])
+        self.assertIs(None, gather_orig_files("mypkg", "1.0", "empty"))
+
+    def test_single(self):
+        self.build_tree(["mypkg_1.0.orig.tar.gz"])
+        self.assertEquals(
+            [os.path.join(self.test_dir, "mypkg_1.0.orig.tar.gz")],
+            gather_orig_files("mypkg", "1.0", "."))

=== modified file 'upstream/__init__.py'
--- upstream/__init__.py	2011-07-16 22:07:04 +0000
+++ upstream/__init__.py	2011-09-07 20:13:24 +0000
@@ -298,7 +298,12 @@
         if r != 0:
             note("uscan could not find the needed tarball.")
             raise PackageVersionNotPresent(package, version, self)
-        return gather_orig_files(package, version, target_dir)
+        orig_files = gather_orig_files(package, version, target_dir)
+        if orig_files is None:
+            note("the expected files generated by uscan could not be found in"
+                 "%s.", target_dir)
+            raise PackageVersionNotPresent(package, version, self)
+        return orig_files
 
 
 class SelfSplitSource(UpstreamSource):