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

[William Grant]

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.

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.

[Jelmer Vernooij (jelmer)]

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

=== modified file 'deb_version.py'
--- deb_version.py	2012-03-25 12:19:46 +0000
+++ deb_version.py	2014-08-06 10:29:41 +0000
@@ -69,7 +69,7 @@
 
     basename = "debversion"
 
-    minimum_format = 0.4
+    minimum_format = 0.3
 
     def __init__(self, branch_name, version):
         super(DebVersionVariable, self).__init__(branch_name)
@@ -102,7 +102,7 @@
 class DebUpstreamBaseVariable(DebUpstreamVariable):
 
     basename = "debupstream-base"
-    minimum_format = 0.4
+    minimum_format = 0.3
 
     def get(self):
         version = super(DebUpstreamBaseVariable, self).get()
@@ -193,7 +193,7 @@
     from bzrlib.plugins.builder.deb_version import DebUpstreamVariable, DebUpstreamBaseVariable, DebVersionVariable
     debupstream_var = DebUpstreamVariable.from_changelog(branch_name, changelog)
     base_branch.deb_version = debupstream_var.replace(base_branch.deb_version)
-    if base_branch.format < 0.4:
+    if base_branch.format < 0.3:
         # The other variables were introduced in recipe format 0.4
         return
     debupstreambase_var = DebUpstreamBaseVariable.from_changelog(
 
=== modified file 'tests/test_blackbox.py'
--- tests/test_blackbox.py	2011-12-11 02:22:58 +0000
+++ tests/test_blackbox.py	2014-08-06 10:29:41 +0000
@@ -381,7 +381,7 @@
     def test_cmd_dailydeb_with_version_from_changelog(self):
         self.requireFeature(NotUnderFakeRootFeature)
         self.make_simple_package("source")
-        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.4 "
+        self.build_tree_contents([("test.recipe", "# bzr-builder format 0.3 "
                     "deb-version {debversion}-2\nsource 1\n")])
         out, err = self.run_bzr(
             "dailydeb --allow-fallback-to-native -q test.recipe working")
@@ -485,8 +485,10 @@
         source = self.make_simple_package("source")
         self.build_tree(["source/debian/source/"])
         self.build_tree_contents([
-            ("source/debian/source/format", "3.0 (quilt)\n")])
-        source.add(["debian/source", "debian/source/format"])
+            ("source/debian/source/format", "3.0 (quilt)\n"),
+            ("source/debian/source/options", 'compression = "gzip"\n')])
+        source.add([
+            "debian/source", "debian/source/format", "debian/source/options"])
         source.commit("set source format")
         return source