Merge lp:~rockstar/launchpad/fix-buildds into lp:launchpad

[Paul Hummer]

Fix the buildds from shitting themselves.

[William Grant (wgrant)]

Looks good. It's the same diff I had.

review: Approve

[Tim Penhey (thumper)]

review: Approve

=== modified file 'lib/canonical/buildd/buildrecipe'
--- lib/canonical/buildd/buildrecipe	2010-04-20 01:36:29 +0000
+++ lib/canonical/buildd/buildrecipe	2010-06-07 22:40:48 +0000
@@ -24,20 +24,18 @@
     """Builds a package from a recipe."""
 
     def __init__(self, build_id, author_name, author_email,
-                 package_name, suite, distroseries_name):
+                 suite, distroseries_name):
         """Constructor.
 
         :param build_id: The id of the build (a str).
         :param author_name: The name of the author (a str).
         :param author_email: The email address of the author (a str).
-        :param package_name: The name of the package (a str).
         :param suite: The suite the package should be built for (a str).
         """
         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
         self.chroot_path = get_build_path(build_id, 'chroot-autobuild')
 
=== modified file 'lib/canonical/buildd/sourcepackagerecipe.py'
--- lib/canonical/buildd/sourcepackagerecipe.py	2010-04-20 01:36:29 +0000
+++ lib/canonical/buildd/sourcepackagerecipe.py	2010-06-07 22:40:48 +0000
@@ -72,7 +72,6 @@
         self.recipe_text = extra_args['recipe_text']
         self.suite = extra_args['suite']
         self.component = extra_args['ogrecomponent']
-        self.package_name = extra_args['package_name']
         self.author_name = extra_args['author_name']
         self.author_email = extra_args['author_email']
         self.archive_purpose = extra_args['archive_purpose']
@@ -86,20 +85,17 @@
         currently_building = get_build_path(
             self._buildid, 'chroot-autobuild/CurrentlyBuilding')
         splat_file(currently_building,
-            'Package: %s\n'
             'Suite: %s\n'
             'Component: %s\n'
             'Purpose: %s\n'
             'Build-Debug-Symbols: no\n' %
-            (self.package_name, self.suite, self.component,
-             self.archive_purpose))
+            (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.package_name, self.suite,
-            self.distroseries_name]
+            self.author_email, self.suite, self.distroseries_name]
         self.runSubProcess(self.build_recipe_path, args)
 
     def iterate_BUILD_RECIPE(self, retcode):