Merge lp:~jelmer/bzr-builddeb/build-unreleased into lp:bzr-builddeb

[Jelmer Vernooij]

When building with distribution set to UNRELEASED, assume the build is targetted at the same distribution as the build before.

[James Westby (james-w)]

review: Approve

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2011-02-04 11:30:52 +0000
+++ tests/test_util.py	2011-02-26 16:37:04 +0000
@@ -740,7 +740,7 @@
 
     def test_find_previous_upload_unknown(self):
         cl = self.make_changelog([("0.1-1", "lucid"),
-                ("0.1-2", "UNRELEASED")])
+                ("0.1-2", "dunno")])
         self.assertRaises(UnknownDistribution, _find_previous_upload, cl)
 
     def test_find_previous_upload_missing(self):
@@ -750,6 +750,11 @@
         cl = self.make_changelog([("0.1-1", "unstable")])
         self.assertRaises(NoPreviousUpload, _find_previous_upload, cl)
 
+    def test_find_previous_upload_unreleased(self):
+        cl = self.make_changelog([("0.1-1", "unstable"),
+                ("0.1-2", "UNRELEASED")])
+        self.assertEqual(Version("0.1-1"), _find_previous_upload(cl))
+
 
 class SourceFormatTests(TestCaseWithTransport):
 
 
=== modified file 'util.py'
--- util.py	2011-02-04 11:30:52 +0000
+++ util.py	2011-02-26 16:37:04 +0000
@@ -596,8 +596,7 @@
     :return: Version object for the previous upload
     :raise NoPreviousUpload: Raised when there is no previous upload
     """
-    blocks = cl._blocks
-    current_target = blocks[0].distributions.split(" ")[0]
+    current_target = find_last_distribution(cl)
     all_debian = [r + t for r in DEBIAN_RELEASES for t in DEBIAN_POCKETS]
     all_ubuntu = [r + t for r in UBUNTU_RELEASES for t in UBUNTU_POCKETS]
     if current_target in all_debian:
@@ -610,7 +609,7 @@
     else:
         raise UnknownDistribution(current_target)
     previous_version = None
-    for block in blocks[1:]:
+    for block in cl._blocks[1:]:
         if block.distributions.split(" ")[0] in match_targets:
             return block.version
     raise NoPreviousUpload(current_target)