Merge lp:~abentley/launchpad/append-distroseries into lp:launchpad

[Aaron Bentley]

Append distroseries to debversion

= Summary =
Provide distroseries in debversion, to prevent builds that differ only by
distroseries from having the same debversion.

== Proposed fix ==
Require a newer version of bzr-builder which supports --append-version.
Pass the distroseries name into the buildd.
Call bzr-builder with --append-version $distroseries.

== Pre-implementation notes ==
Preimplementation was with james_w

== Implementation details ==
Various lint fixes were done as drivebys. Globally suppressed F0401, "Unable
to import", because it produces excessive false positives, and legitimate
instances of this issue would be caught by the test suite anyhow.

== Tests ==
bin/test test_recipebuilder

== Demo and Q/A ==
Should be tested on dogfood.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  utilities/lp.pylintrc
  lib/canonical/buildd/sourcepackagerecipe.py
  lib/canonical/buildd/buildrecipe
  utilities/sourcedeps.conf
  lib/lp/code/tests/test_recipebuilder.py
  lib/lp/code/model/recipebuilder.py

[Tim Penhey (thumper)]

Seems fine.

review: Approve

=== modified file 'lib/canonical/buildd/buildrecipe'
--- lib/canonical/buildd/buildrecipe	2010-01-14 02:36:36 +0000
+++ lib/canonical/buildd/buildrecipe	2010-04-20 01:40:48 +0000
@@ -24,7 +24,7 @@
     """Builds a package from a recipe."""
 
     def __init__(self, build_id, author_name, author_email,
-                 package_name, suite):
+                 package_name, suite, distroseries_name):
         """Constructor.
 
         :param build_id: The id of the build (a str).
@@ -36,6 +36,7 @@
         self.build_id = build_id
         self.author_name = author_name
         self.author_email = author_email
+        self.distroseries_name = distroseries_name
         self.package_name = package_name
         self.suite = suite
         self.base_branch = None
@@ -69,7 +70,8 @@
             'sudo', '-u', self.username, 'DEBEMAIL=%s' % self.author_email,
             'DEBFULLNAME=%s' % self.author_name, 'bzr', 'dailydeb',
             '--no-build', recipe_path_relative, self.tree_path_relative,
-            '--manifest', manifest_path_relative])
+            '--manifest', manifest_path_relative,
+            '--append-version', '~%s1' % self.distroseries_name])
         if retcode != 0:
             return retcode
         (source,) = [name for name in os.listdir(self.tree_path)

=== modified file 'lib/canonical/buildd/sourcepackagerecipe.py'
--- lib/canonical/buildd/sourcepackagerecipe.py	2010-01-14 20:55:22 +0000
+++ lib/canonical/buildd/sourcepackagerecipe.py	2010-04-20 01:40:48 +0000
@@ -1,5 +1,6 @@
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
+# pylint: disable-msg=E1002
 
 """The manager class for building packages from recipes."""
 
@@ -75,6 +76,7 @@
         self.author_name = extra_args['author_name']
         self.author_email = extra_args['author_email']
         self.archive_purpose = extra_args['archive_purpose']
+        self.distroseries_name = extra_args['distroseries_name']
 
         super(SourcePackageRecipeBuildManager, self).initiate(
             files, chroot, extra_args)
@@ -96,7 +98,8 @@
         splat_file(recipe_path, self.recipe_text)
         args = [
             "buildrecipe.py", self._buildid, self.author_name,
-            self.author_email, self.package_name, self.suite]
+            self.author_email, self.package_name, self.suite,
+            self.distroseries_name]
         self.runSubProcess(self.build_recipe_path, args)
 
     def iterate_BUILD_RECIPE(self, retcode):

=== modified file 'lib/lp/code/model/recipebuilder.py'
--- lib/lp/code/model/recipebuilder.py	2010-04-12 05:52:01 +0000
+++ lib/lp/code/model/recipebuilder.py	2010-04-20 01:40:48 +0000
@@ -8,7 +8,7 @@
     'RecipeBuildBehavior',
     ]
 
-from zope.component import adapts, getUtility
+from zope.component import adapts
 from zope.interface import implements
 
 from lp.archiveuploader.permission import check_upload_to_pocket
@@ -18,8 +18,7 @@
 from lp.buildmaster.model.buildfarmjobbehavior import (
     BuildFarmJobBehaviorBase)
 from lp.code.interfaces.sourcepackagerecipebuild import (
-    ISourcePackageRecipeBuildJob, ISourcePackageRecipeBuildSource)
-from lp.code.model.sourcepackagerecipebuild import SourcePackageRecipeBuild
+    ISourcePackageRecipeBuildJob)
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.archivedependencies import (
     get_primary_current_component, get_sources_list_for_building)
@@ -71,6 +70,7 @@
             self.build.sourcepackagename.name)
         args['archives'] = get_sources_list_for_building(self.build,
             distroarchseries, self.build.sourcepackagename.name)
+        args['distroseries_name'] = self.build.distroseries.name
         return args
 
     def dispatchBuildToSlave(self, build_queue_id, logger):

=== modified file 'lib/lp/code/tests/test_recipebuilder.py'
--- lib/lp/code/tests/test_recipebuilder.py	2010-04-13 14:50:01 +0000
+++ lib/lp/code/tests/test_recipebuilder.py	2010-04-20 01:40:48 +0000
@@ -112,7 +112,8 @@
            'recipe_text': '# bzr-builder format 0.2 deb-version 1.0\n'
                           'lp://dev/~joe/someapp/pkg\n',
            'archives': get_sources_list_for_building(job.build,
-                distroarchseries, job.build.sourcepackagename.name)
+                distroarchseries, job.build.sourcepackagename.name),
+           'distroseries_name': job.build.distroseries.name,
             }, job._extraBuildArgs(distroarchseries))
 
     def test_dispatchBuildToSlave(self):

=== modified file 'utilities/lp.pylintrc'
--- utilities/lp.pylintrc	2009-06-24 20:15:50 +0000
+++ utilities/lp.pylintrc	2010-04-20 01:40:48 +0000
@@ -73,7 +73,7 @@
 # :W0621: *Redefining name %r from outer scope (line %s)* (pylint does a poor evaluation)
 # :W0704: *Except does not do anything* (Does not check for comment explaining fall-through)
 # :E0611: *No name %r in module 'sqlobject'* (Pylint shipped with gutsy does not understand SQLObject. Pyflakes checks the imports too anyway.)
-disable-msg=I0011,E0101,E0202,E0203,C0103,C0202,C0302,C0111,W0142,W0201,W0212,W0221,W0223,W0232,W0612,W0613,W0621,W0622,W0704,W0710,E0611
+disable-msg=I0011,E0101,E0202,E0203,C0103,C0202,C0302,C0111,W0142,W0201,W0212,W0221,W0223,W0232,W0612,W0613,W0621,W0622,W0704,W0710,E0611,F0401
 
 
 [REPORTS]

=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-04-14 14:12:29 +0000
+++ utilities/sourcedeps.conf	2010-04-20 01:40:48 +0000
@@ -1,4 +1,4 @@
-bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=63
+bzr-builder lp:~launchpad-pqm/bzr-builder/trunk;revno=64
 bzr-git lp:~launchpad-pqm/bzr-git/devel;revno=253
 bzr-hg lp:~launchpad-pqm/bzr-hg/devel;revno=281
 bzr-loom lp:~launchpad-pqm/bzr-loom/trunk;revno=47