Merge lp:~abentley/launchpad/fix-stuck into lp:launchpad

[Aaron Bentley]

Fix bug #598258 by encoding author name.

= Summary =
Fix bug #598258: recipe build hangs (~deejay1/+recipe/daily).

== Proposed fix ==
Encode the author's name as utf-8.

== Pre-implementation notes ==
None

== Implementation details ==
In order to test this locally, I had to fix the test script test_buildd_recipe.
As well as fixing it, I added support for apt_cacher_ng, to avoid excessive
downloads. I changed it to abort early when it can't proceeed. I updated the
chroot md5sum to the current lucid chroot.

It turns out that, for reasons unknown, pbuilder objects to the Package: line
being missing from the /CurrentlyBuilding file when testing locally. (But not,
it appears, when running on production builders.) So I had to change
CurrentlyBuilding to be created by the buildrecipe script, after the recipe has
been executed, using the package name in debian/changelog (which is
authoritative).

I also added the build results to .bzrignore.

== Tests ==
test_buildd_recipe

== Demo and Q/A ==
Change your display name to include non-ascii characters. Create a recipe and
request a build. It should work completely.

= Launchpad lint =

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

Linting changed files:
  .bzrignore
  lib/canonical/buildd/sourcepackagerecipe.py
  lib/canonical/buildd/buildrecipe
  lib/canonical/buildd/test_buildd_recipe

[Edwin Grubbs (edwin-grubbs)]

Hi Aaron,

This looks good.

merge-approved

-Edwin

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-06-24 17:19:09 +0000
+++ .bzrignore	2010-06-30 18:09:31 +0000
@@ -69,3 +69,10 @@
 apidocs
 twistd.pid
 lib/canonical/launchpad/apidoc
+lib/canonical/launchpad-buildd_*.dsc
+lib/canonical/launchpad-buildd_*.tar.gz
+lib/canonical/launchpad-buildd_*_all.deb
+lib/canonical/launchpad-buildd_*.changes
+lib/canonical/launchpad-buildd_*_source.build
+lib/canonical/launchpad-buildd_*_source.changes
+lib/canonical/buildd/debian/*

=== modified file 'lib/canonical/buildd/buildrecipe'
--- lib/canonical/buildd/buildrecipe	2010-06-07 19:11:49 +0000
+++ lib/canonical/buildd/buildrecipe	2010-06-30 18:09:31 +0000
@@ -7,6 +7,7 @@
 __metaclass__ = type
 
 
+import os
 import os.path
 import pwd
 from subprocess import call
@@ -24,7 +25,7 @@
     """Builds a package from a recipe."""
 
     def __init__(self, build_id, author_name, author_email,
-                 suite, distroseries_name):
+                 suite, distroseries_name, component, archive_purpose):
         """Constructor.
 
         :param build_id: The id of the build (a str).
@@ -33,8 +34,10 @@
         :param suite: The suite the package should be built for (a str).
         """
         self.build_id = build_id
-        self.author_name = author_name
+        self.author_name = author_name.decode('utf-8')
         self.author_email = author_email
+        self.archive_purpose = archive_purpose
+        self.component = component
         self.distroseries_name = distroseries_name
         self.suite = suite
         self.base_branch = None
@@ -66,9 +69,9 @@
             self.tree_path_relative, 'manifest')
         retcode = self.chroot([
             '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,
+            'DEBFULLNAME=%s' % self.author_name.encode('utf-8'), 'bzr',
+            'dailydeb', '--no-build', recipe_path_relative,
+            self.tree_path_relative, '--manifest', manifest_path_relative,
             '--append-version', '~%s1' % self.distroseries_name])
         if retcode != 0:
             return retcode
@@ -78,8 +81,27 @@
                                                 source)
         return retcode
 
+    def getPackageName(self):
+        source_dir = os.path.join(
+            self.chroot_path, self.source_dir_relative.lstrip('/'))
+        changelog = os.path.join(source_dir, 'debian/changelog')
+        return open(changelog, 'r').readline().split(' ')[0]
+
     def installBuildDeps(self):
         """Install the build-depends of the source tree."""
+        package = self.getPackageName()
+        currently_building_path = os.path.join(
+            self.chroot_path, 'CurrentlyBuilding')
+        currently_building_contents = (
+            'Package: %s\n'
+            'Suite: %s\n'
+            'Component: %s\n'
+            'Purpose: %s\n'
+            'Build-Debug-Symbols: no\n' %
+            (package, self.suite, self.component, self.archive_purpose))
+        currently_building = open(currently_building_path, 'w')
+        currently_building.write(currently_building_contents)
+        currently_building.close()
         return self.chroot(['sh', '-c', 'cd %s &&'
                      '/usr/lib/pbuilder/pbuilder-satisfydepends'
                      % self.source_dir_relative])

=== modified file 'lib/canonical/buildd/sourcepackagerecipe.py'
--- lib/canonical/buildd/sourcepackagerecipe.py	2010-06-07 19:11:49 +0000
+++ lib/canonical/buildd/sourcepackagerecipe.py	2010-06-30 18:09:31 +0000
@@ -82,20 +82,13 @@
 
     def doRunBuild(self):
         """Run the build process to build the source package."""
-        currently_building = get_build_path(
-            self._buildid, 'chroot-autobuild/CurrentlyBuilding')
-        splat_file(currently_building,
-            'Suite: %s\n'
-            'Component: %s\n'
-            'Purpose: %s\n'
-            'Build-Debug-Symbols: no\n' %
-            (self.suite, self.component, self.archive_purpose))
         os.makedirs(get_chroot_path(self._buildid, 'work'))
         recipe_path = get_chroot_path(self._buildid, 'work/recipe')
         splat_file(recipe_path, self.recipe_text)
         args = [
-            "buildrecipe.py", self._buildid, self.author_name,
-            self.author_email, self.suite, self.distroseries_name]
+            "buildrecipe.py", self._buildid, self.author_name.encode('utf-8'),
+            self.author_email, self.suite, self.distroseries_name,
+            self.component, self.archive_purpose]
         self.runSubProcess(self.build_recipe_path, args)
 
     def iterate_BUILD_RECIPE(self, retcode):

=== modified file 'lib/canonical/buildd/test_buildd_recipe'
--- lib/canonical/buildd/test_buildd_recipe	2010-01-14 20:34:11 +0000
+++ lib/canonical/buildd/test_buildd_recipe	2010-06-30 18:09:31 +0000
@@ -5,25 +5,43 @@
 # This is a script to do end-to-end testing of the buildd with a bzr-builder
 # recipe, without involving the BuilderBehaviour.
 
+country_code = 'us'
+apt_cacher_ng_host = 'stumpy'
+distroseries_name = 'lucid'
+recipe_text = """# bzr-builder format 0.2 deb-version 0+{revno}
+http://bazaar.launchpad.dev/~ppa-user/+junk/wakeonlan"""
+
+def deb_line(host, suites):
+    prefix = 'deb http://'
+    if apt_cacher_ng_host != None:
+        prefix += '%s:3142/' % apt_cacher_ng_host
+    return '%s%s %s %s' % (prefix, host, distroseries_name, suites)
+
+import sys
 from xmlrpclib import ServerProxy
+
 proxy = ServerProxy('http://localhost:8221/rpc')
 print proxy.echo('Hello World')
 print proxy.info()
-print proxy.status()
-recipe_text = """# bzr-builder format 0.2 deb-version something
-http://bazaar.launchpad.net/~james-w/bzr-builder/trunk/
-merge packaging http://bazaar.launchpad.net/~james-w/bzr-builder/packaging"""
+status = proxy.status()
+print status
+if status[0] != 'BuilderStatus.IDLE':
+    print "Aborting due to non-IDLE builder."
+    sys.exit(1)
 print proxy.build(
-    '1-2', 'sourcepackagerecipe', 'f2afc3c0507dffba181638d70ae55ac675679460',
-    {}, {'author_name': 'Steve',
+    '1-2', 'sourcepackagerecipe', '1ef177161c3cb073e66bf1550931c6fbaa0a94b0',
+    {}, {'author_name': u'Steve\u1234',
          'author_email': '[e-mail]',
-         'package_name': 'bzr-builder',
-         'suite': 'lucid',
+         'suite': distroseries_name,
+         'distroseries_name': distroseries_name,
          'ogrecomponent': 'universe',
          'archive_purpose': 'puppies',
          'recipe_text': recipe_text,
          'archives': [
-            'deb http://nz.archive.ubuntu.com/ubuntu lucid main universe']})
+            deb_line('%s.archive.ubuntu.com/ubuntu' % country_code,
+                     'main universe'),
+            deb_line('ppa.launchpad.net/launchpad/bzr-builder-dev/ubuntu',
+                     'main'),]})
 #status = proxy.status()
 #for filename, sha1 in status[3].iteritems():
 #    print filename