Merge lp:~wgrant/bzr-builder/bug-1350430 into lp:bzr-builder

Proposed by William Grant on 2014-08-06
Status: Merged
Merged at revision: 173
Proposed branch: lp:~wgrant/bzr-builder/bug-1350430
Merge into: lp:bzr-builder
Diff against target: 55 lines (+8/-6)
2 files modified
deb_version.py (+3/-3)
tests/test_blackbox.py (+5/-3)
To merge this branch: bzr merge lp:~wgrant/bzr-builder/bug-1350430
Reviewer Review Type Date Requested Status
Colin Watson (community) 2014-08-06 Approve on 2014-08-06
bzr-builder developers 2014-08-06 Pending
Review via email: mp+229760@code.launchpad.net

Commit message

debversion and debupstream-base were used extensively in format 0.3 recipes, so revert the change in 0.7.3 that forbade them before 0.4.

Description of the change

debversion and debupstream-base were used extensively in format 0.3 recipes on Launchpad, so revert the change in 0.7.3 that forbade them before 0.4. There were also a few uses of debupstream-base in 0.2, but probably not enough to worry about.

I also fixed test_blackbox to pass on utopic.

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

On Wed, Aug 06, 2014 at 10:30:35AM -0000, William Grant wrote:
> William Grant has proposed merging lp:~wgrant/bzr-builder/bug-1350430 into lp:bzr-builder.
>
> Commit message:
> debversion and debupstream-base were used extensively in format 0.3 recipes, so revert the change in 0.7.3 that forbade them before 0.4.
>
> Requested reviews:
> bzr-builder developers (bzr-builder-devs)
> Related bugs:
> Bug #1350430 in bzr-builder: "{debupstream} {debversion} not recognised by format 0.4"
> https://bugs.launchpad.net/bzr-builder/+bug/1350430
>
> For more details, see:
> https://code.launchpad.net/~wgrant/bzr-builder/bug-1350430/+merge/229760
>
> debversion and debupstream-base were used extensively in format 0.3 recipes on Launchpad, so revert the change in 0.7.3 that forbade them before 0.4. There were also a few uses of debupstream-base in 0.2, but probably not enough to worry about.
>
> I also fixed test_blackbox to pass on utopic.

Looks good to me, but I'm pretty sure I don't have any sort of official
powers to approve this. :)

Jelmer

Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deb_version.py'
2--- deb_version.py 2012-03-25 12:19:46 +0000
3+++ deb_version.py 2014-08-06 10:29:41 +0000
4@@ -69,7 +69,7 @@
5
6 basename = "debversion"
7
8- minimum_format = 0.4
9+ minimum_format = 0.3
10
11 def __init__(self, branch_name, version):
12 super(DebVersionVariable, self).__init__(branch_name)
13@@ -102,7 +102,7 @@
14 class DebUpstreamBaseVariable(DebUpstreamVariable):
15
16 basename = "debupstream-base"
17- minimum_format = 0.4
18+ minimum_format = 0.3
19
20 def get(self):
21 version = super(DebUpstreamBaseVariable, self).get()
22@@ -193,7 +193,7 @@
23 from bzrlib.plugins.builder.deb_version import DebUpstreamVariable, DebUpstreamBaseVariable, DebVersionVariable
24 debupstream_var = DebUpstreamVariable.from_changelog(branch_name, changelog)
25 base_branch.deb_version = debupstream_var.replace(base_branch.deb_version)
26- if base_branch.format < 0.4:
27+ if base_branch.format < 0.3:
28 # The other variables were introduced in recipe format 0.4
29 return
30 debupstreambase_var = DebUpstreamBaseVariable.from_changelog(
31
32=== modified file 'tests/test_blackbox.py'
33--- tests/test_blackbox.py 2011-12-11 02:22:58 +0000
34+++ tests/test_blackbox.py 2014-08-06 10:29:41 +0000
35@@ -381,7 +381,7 @@
36 def test_cmd_dailydeb_with_version_from_changelog(self):
37 self.requireFeature(NotUnderFakeRootFeature)
38 self.make_simple_package("source")
39- self.build_tree_contents([("test.recipe", "# bzr-builder format 0.4 "
40+ self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
41 "deb-version {debversion}-2\nsource 1\n")])
42 out, err = self.run_bzr(
43 "dailydeb --allow-fallback-to-native -q test.recipe working")
44@@ -485,8 +485,10 @@
45 source = self.make_simple_package("source")
46 self.build_tree(["source/debian/source/"])
47 self.build_tree_contents([
48- ("source/debian/source/format", "3.0 (quilt)\n")])
49- source.add(["debian/source", "debian/source/format"])
50+ ("source/debian/source/format", "3.0 (quilt)\n"),
51+ ("source/debian/source/options", 'compression = "gzip"\n')])
52+ source.add([
53+ "debian/source", "debian/source/format", "debian/source/options"])
54 source.commit("set source format")
55 return source
56

Subscribers

People subscribed via source and target branches