Merge lp:~jelmer/bzr-builddeb/552893-fix-upstream-tarball into lp:bzr-builddeb

[Jelmer Vernooij]

This fixes the "assert path is not None" error (or at least one of its instances).

GetOrigSourceSource would happily claim success in some situations, because it only raises RevisionNotPresent when _get_orig_source() returns None, not when it returns False.

This would then cause provide_from_store_dir() to not be able to find the upstream tarball, and return None.

[James Westby (james-w)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-31 18:47:05 +0000
+++ debian/changelog	2011-01-31 23:31:15 +0000
@@ -39,8 +39,10 @@
     tree rather than relative to the branch. Closes: #676456
   * Use enums for build types, and a priority scheme to figure out the
     build type. LP: #655277
+  * Fix finding upstream tarball when get-orig-source is not available.
+    Closes: #552893
 
- -- Jelmer Vernooij <[e-mail]>  Sun, 30 Jan 2011 23:09:45 +0100
+ -- Jelmer Vernooij <[e-mail]>  Tue, 01 Feb 2011 00:13:07 +0100
 
 bzr-builddeb (2.5) unstable; urgency=low
 

=== modified file 'upstream.py'
--- upstream.py	2011-01-29 02:11:01 +0000
+++ upstream.py	2011-01-31 23:31:15 +0000
@@ -240,7 +240,7 @@
         ret = proc.wait()
         if ret != 0:
             note("Trying to run get-orig-source rule failed")
-            return False
+            return None
         for desired_tarball_name in desired_tarball_names:
             fetched_tarball = os.path.join(source_dir, desired_tarball_name)
             if os.path.exists(fetched_tarball):
@@ -400,9 +400,12 @@
     def fetch_tarball(self, package, version, target_dir):
         for source in self._sources:
             try:
-                return source.fetch_tarball(package, version, target_dir)
+                path = source.fetch_tarball(package, version, target_dir)
             except PackageVersionNotPresent:
                 pass
+            else:
+                assert isinstance(path, basestring)
+                return path
         raise PackageVersionNotPresent(package, version, self)
 
     def get_latest_version(self, package, version):
@@ -468,12 +471,13 @@
             if not os.path.exists(self.store_dir):
                 os.makedirs(self.store_dir)
             try:
-                self.source.fetch_tarball(self.package,
+                path = self.source.fetch_tarball(self.package,
                     self.version.upstream_version, self.store_dir)
             except PackageVersionNotPresent:
                 raise MissingUpstreamTarball(self._tarball_names()[0])
+            assert isinstance(path, basestring)
         else:
-             note("Using the upstream tarball that is present in %s" %
+            note("Using the upstream tarball that is present in %s" %
                  self.store_dir)
         path = self.provide_from_store_dir(target_dir)
         assert path is not None