Launchpad itself

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

  1. fix-buildds
  2. Merge into devel
Proposed by Paul Hummer on 2010-06-07
Status: Merged
Approved by: Tim Penhey on 2010-06-08
Approved revision: no longer in the source branch.
Merged at revision: 10971
Proposed branch: lp:~rockstar/launchpad/fix-buildds
Merge into: lp:launchpad
Diff against target: 60 lines (+3/-9)
2 files modified
lib/canonical/buildd/buildrecipe (+1/-3)
lib/canonical/buildd/sourcepackagerecipe.py (+2/-6)
To merge this branch: bzr merge lp:~rockstar/launchpad/fix-buildds
Reviewer Review Type Date Requested Status
Tim Penhey (community) 2010-06-08 Approve on 2010-06-08
William Grant 2010-06-07 Approve on 2010-06-08
Review via email: mp+26990@code.launchpad.net

Description of the Change

Fix the buildds from shitting themselves.

To post a comment you must log in.
William Grant (wgrant) wrote :

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

review: Approve
Tim Penhey (thumper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/buildd/buildrecipe'
2--- lib/canonical/buildd/buildrecipe 2010-04-20 01:36:29 +0000
3+++ lib/canonical/buildd/buildrecipe 2010-06-07 22:40:48 +0000
4@@ -24,20 +24,18 @@
5 """Builds a package from a recipe."""
6
7 def __init__(self, build_id, author_name, author_email,
8- package_name, suite, distroseries_name):
9+ suite, distroseries_name):
10 """Constructor.
11
12 :param build_id: The id of the build (a str).
13 :param author_name: The name of the author (a str).
14 :param author_email: The email address of the author (a str).
15- :param package_name: The name of the package (a str).
16 :param suite: The suite the package should be built for (a str).
17 """
18 self.build_id = build_id
19 self.author_name = author_name
20 self.author_email = author_email
21 self.distroseries_name = distroseries_name
22- self.package_name = package_name
23 self.suite = suite
24 self.base_branch = None
25 self.chroot_path = get_build_path(build_id, 'chroot-autobuild')
26
27=== modified file 'lib/canonical/buildd/sourcepackagerecipe.py'
28--- lib/canonical/buildd/sourcepackagerecipe.py 2010-04-20 01:36:29 +0000
29+++ lib/canonical/buildd/sourcepackagerecipe.py 2010-06-07 22:40:48 +0000
30@@ -72,7 +72,6 @@
31 self.recipe_text = extra_args['recipe_text']
32 self.suite = extra_args['suite']
33 self.component = extra_args['ogrecomponent']
34- self.package_name = extra_args['package_name']
35 self.author_name = extra_args['author_name']
36 self.author_email = extra_args['author_email']
37 self.archive_purpose = extra_args['archive_purpose']
38@@ -86,20 +85,17 @@
39 currently_building = get_build_path(
40 self._buildid, 'chroot-autobuild/CurrentlyBuilding')
41 splat_file(currently_building,
42- 'Package: %s\n'
43 'Suite: %s\n'
44 'Component: %s\n'
45 'Purpose: %s\n'
46 'Build-Debug-Symbols: no\n' %
47- (self.package_name, self.suite, self.component,
48- self.archive_purpose))
49+ (self.suite, self.component, self.archive_purpose))
50 os.makedirs(get_chroot_path(self._buildid, 'work'))
51 recipe_path = get_chroot_path(self._buildid, 'work/recipe')
52 splat_file(recipe_path, self.recipe_text)
53 args = [
54 "buildrecipe.py", self._buildid, self.author_name,
55- self.author_email, self.package_name, self.suite,
56- self.distroseries_name]
57+ self.author_email, self.suite, self.distroseries_name]
58 self.runSubProcess(self.build_recipe_path, args)
59
60 def iterate_BUILD_RECIPE(self, retcode):