Launchpad itself

Merge lp:~lamont/launchpad/lp-buildd-70 into lp:launchpad

  1. lp-buildd-70
  2. Merge into devel
Proposed by James Westby
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 11431
Proposed branch: lp:~lamont/launchpad/lp-buildd-70
Merge into: lp:launchpad
Diff against target: 98 lines (+36/-10)
3 files modified
lib/canonical/buildd/buildrecipe (+9/-8)
lib/canonical/buildd/debian/changelog (+25/-0)
lib/canonical/buildd/sbuild-package (+2/-2)
To merge this branch: bzr merge lp:~lamont/launchpad/lp-buildd-70
Reviewer Review Type Date Requested Status
Jelmer Vernooij (community) code Approve
Review via email: mp+33455@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

As discussed on IRC, it would be nice if the changelog for version 70 could mention that it reintroduces all changesw from version 68 that were reverted in 69.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/buildd/buildrecipe'
--- lib/canonical/buildd/buildrecipe 2010-08-12 21:58:18 +0000
+++ lib/canonical/buildd/buildrecipe 2010-08-23 21:46:43 +0000
@@ -8,7 +8,6 @@
88
99
10import os10import os
11import os.path
12import pwd11import pwd
13import socket12import socket
14from subprocess import call13from subprocess import call
@@ -76,11 +75,17 @@
76 recipe = recipe_file.read()75 recipe = recipe_file.read()
77 finally:76 finally:
78 recipe_file.close()77 recipe_file.close()
78 # As of bzr 2.2, a defined identity is needed. In this case, we're using
79 # buildd@<hostname>.
80 hostname = socket.gethostname()
81 bzr_email = 'buildd@%s' % hostname
82
79 print 'Building recipe:'83 print 'Building recipe:'
80 print recipe84 print recipe
81 retcode = self.chroot([85 retcode = self.chroot([
82 'sudo', '-iu', self.username, 'DEBEMAIL=%s' % self.author_email,86 'sudo', '-i', '-u', self.username, 'DEBEMAIL=%s' % self.author_email,
83 'DEBFULLNAME=%s' % self.author_name.encode('utf-8'), 'bzr',87 'DEBFULLNAME=%s' % self.author_name.encode('utf-8'),
88 'BZR_EMAIL=%s' % bzr_email, 'bzr',
84 'dailydeb', '--no-build', recipe_path_relative,89 'dailydeb', '--no-build', recipe_path_relative,
85 self.tree_path_relative, '--manifest', manifest_path_relative,90 self.tree_path_relative, '--manifest', manifest_path_relative,
86 '--append-version', '~%s1' % self.distroseries_name],91 '--append-version', '~%s1' % self.distroseries_name],
@@ -127,6 +132,7 @@
127 if echo:132 if echo:
128 print "Running in chroot: %s" % ' '.join(133 print "Running in chroot: %s" % ' '.join(
129 "'%s'" % arg for arg in args)134 "'%s'" % arg for arg in args)
135 sys.stdout.flush()
130 return call([136 return call([
131 '/usr/bin/sudo', '/usr/sbin/chroot', self.chroot_path] + args)137 '/usr/bin/sudo', '/usr/sbin/chroot', self.chroot_path] + args)
132138
@@ -156,11 +162,6 @@
156 os.environ["HOME"], "build-" + build_id, *extra)162 os.environ["HOME"], "build-" + build_id, *extra)
157163
158if __name__ == '__main__':164if __name__ == '__main__':
159 # As of bzr 2.2, a defined identity is needed. In this case, we're using
160 # buildd@<hostname>.
161 hostname = socket.gethostname()
162 os.environ['BZR_EMAIL'] = 'buildd@%s' % hostname
163
164 builder = RecipeBuilder(*sys.argv[1:])165 builder = RecipeBuilder(*sys.argv[1:])
165 if builder.install() != 0:166 if builder.install() != 0:
166 sys.exit(RETCODE_FAILURE_INSTALL)167 sys.exit(RETCODE_FAILURE_INSTALL)
167168
=== modified file 'lib/canonical/buildd/debian/changelog'
--- lib/canonical/buildd/debian/changelog 2010-08-16 19:29:00 +0000
+++ lib/canonical/buildd/debian/changelog 2010-08-23 21:46:43 +0000
@@ -1,3 +1,28 @@
1launchpad-buildd (70) hardy-cat; urgency=low
2
3 [ LaMont Jones ]
4 * Restore the rest of version 68.
5
6 [ James Westby ]
7 * buildrecipe: Specify BZR_EMAIL via sudo so that the called command
8 sees the environment variable.
9 * buildrecipe: call sudo -i -u instead of sudo -iu so that it works with
10 older versions of sudo.
11 * buildrecipe: flush stdout before calling another command so that
12 the build log has the output correctly interleaved.
13
14 [ William Grant ]
15 * correct arch_tag arguments.
16
17 -- LaMont Jones <lamont@canonical.com> Fri, 20 Aug 2010 13:27:55 -0600
18
19launchpad-buildd (69) hardy-cat; urgency=low
20
21 * REVERT all of version 68 except for BZR_EMAIL LP#617072
22 (Not reflected in bzr.)
23
24 -- LaMont Jones <lamont@canonical.com> Tue, 17 Aug 2010 10:40:03 -0600
25
1launchpad-buildd (68) hardy-cat; urgency=low26launchpad-buildd (68) hardy-cat; urgency=low
227
3 [ William Grant ]28 [ William Grant ]
429
=== modified file 'lib/canonical/buildd/sbuild-package'
--- lib/canonical/buildd/sbuild-package 2010-07-13 09:13:41 +0000
+++ lib/canonical/buildd/sbuild-package 2010-08-23 21:46:43 +0000
@@ -19,8 +19,8 @@
1919
20SBUILD=/usr/bin/sbuild20SBUILD=/usr/bin/sbuild
21BUILDID=$121BUILDID=$1
22SUITE=$222ARCHITECTURETAG=$2
23ARCHITECTURETAG=$323SUITE=$3
2424
25shift 325shift 3
2626