bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/709263-previous-to-pocket into lp:bzr-builddeb

  1. 709263-previous-to-pocket
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 495
Proposed branch: lp:~jelmer/bzr-builddeb/709263-previous-to-pocket
Merge into: lp:bzr-builddeb
Diff against target: 52 lines (+11/-3)
4 files modified
.bzrignore (+1/-0)
debian/changelog (+3/-1)
tests/test_util.py (+5/-0)
util.py (+2/-2)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/709263-previous-to-pocket
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+47826@code.launchpad.net

This proposal supersedes a proposal from 2011-01-28.

Description of the change

Fix builds where the previous upload was to a pocket.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote : Posted in a previous version of this proposal

Hi,

are you sure this is the proposal you intended to make? The diff is huge.

Thanks,

James

Revision history for this message
James Westby (james-w) :
review: Approve
lp:~jelmer/bzr-builddeb/709263-previous-to-pocket updated
495. By Jelmer Vernooij

Merge support for building package where previous upload was to a non-release pocket.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2011-01-28 16:31:55 +0000
4@@ -0,0 +1,1 @@
5+.testrepository
6
7=== modified file 'debian/changelog'
8--- debian/changelog 2011-01-13 18:14:01 +0000
9+++ debian/changelog 2011-01-28 16:31:55 +0000
10@@ -27,8 +27,10 @@
11 * When adding a changelog entry, support git and svn snapshots.
12 * Automatically use debian/source/format if package is native. Closes:
13 #586617
14+ * Fix "bzr builddeb" if last upload was not to a Ubuntu release pocket.
15+ LP: #709263
16
17- -- Jelmer Vernooij <jelmer@debian.org> Wed, 12 Jan 2011 22:05:40 +0100
18+ -- Jelmer Vernooij <jelmer@debian.org> Fri, 28 Jan 2011 15:13:22 +0100
19
20 bzr-builddeb (2.5) unstable; urgency=low
21
22
23=== modified file 'tests/test_util.py'
24--- tests/test_util.py 2011-01-11 00:24:12 +0000
25+++ tests/test_util.py 2011-01-28 16:31:55 +0000
26@@ -769,6 +769,11 @@
27 ("0.1-1.1", "unstable"), ("0.1-2", "maverick")])
28 self.assertEqual(Version("0.1-1"), _find_previous_upload(cl))
29
30+ def test_find_previous_upload_ubuntu_pocket(self):
31+ cl = self.make_changelog([("0.1-1", "lucid-updates"),
32+ ("0.1-2", "lucid-updates")])
33+ self.assertEqual(Version("0.1-1"), _find_previous_upload(cl))
34+
35 def test_find_previous_upload_unknown(self):
36 cl = self.make_changelog([("0.1-1", "lucid"),
37 ("0.1-2", "UNRELEASED")])
38
39=== modified file 'util.py'
40--- util.py 2011-01-13 18:14:01 +0000
41+++ util.py 2011-01-28 16:31:55 +0000
42@@ -641,8 +641,8 @@
43 elif current_target in all_ubuntu:
44 match_targets = UBUNTU_RELEASES
45 if "-" in current_target:
46- match_targets += [current_target.split("-", 1)[0]
47- + t for t in UBUNTU_POCKETS]
48+ match_targets += tuple([current_target.split("-", 1)[0]
49+ + t for t in UBUNTU_POCKETS])
50 else:
51 raise UnknownDistribution(current_target)
52 previous_version = None

Subscribers

People subscribed via source and target branches