[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r266: * Fix retrieval of the upstream source from a watch file of the archive.

[James Westby]

------------------------------------------------------------
revno: 266
committer: James Westby <jw+debian at jameswestby.net>
branch nick: 2.0
timestamp: Thu 2008-08-28 11:44:37 +0100
message:
  * Fix retrieval of the upstream source from a watch file of the archive.
    - It would download to the specified tarball directory, but then
      report it as stored in the compatibility directory.
modified:
  builder.py
  debian/changelog
-------------- next part --------------
=== modified file 'builder.py'
--- a/builder.py	2008-08-27 12:13:34 +0000
+++ b/builder.py	2008-08-28 10:44:37 +0000
@@ -245,11 +245,12 @@
       tarballdir = os.path.join('..', 'tarballs')
       found = False
       if tarballdir != self._properties.tarball_dir():
-        tarball = os.path.join(tarballdir,self._tarball_name())
+        compat_tarball = os.path.join(tarballdir,self._tarball_name())
         info("For compatibility looking for %s to use as upstream source",
-                tarball)
-        if os.path.exists(tarball):
+                compat_tarball)
+        if os.path.exists(compat_tarball):
           found = True
+          tarball = compat_tarball
       if not found:
         if self._get_upstream_from_archive():
           return tarball

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-08-28 10:42:18 +0000
+++ b/debian/changelog	2008-08-28 10:44:37 +0000
@@ -1,6 +1,8 @@
 bzr-builddeb (2.0.1) UNRELEASED; urgency=low
 
-  * 
+  * Fix retrieval of the upstream source from a watch file of the archive.
+    - It would download to the specified tarball directory, but then
+      report it as stored in the compatibility directory.
 
  -- James Westby <james.westby at canonical.com>  Thu, 28 Aug 2008 11:41:35 +0100