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
1=== modified file 'lib/canonical/buildd/buildrecipe'
2--- lib/canonical/buildd/buildrecipe 2010-08-12 21:58:18 +0000
3+++ lib/canonical/buildd/buildrecipe 2010-08-23 21:46:43 +0000
4@@ -8,7 +8,6 @@
5
6
7 import os
8-import os.path
9 import pwd
10 import socket
11 from subprocess import call
12@@ -76,11 +75,17 @@
13 recipe = recipe_file.read()
14 finally:
15 recipe_file.close()
16+ # As of bzr 2.2, a defined identity is needed. In this case, we're using
17+ # buildd@<hostname>.
18+ hostname = socket.gethostname()
19+ bzr_email = 'buildd@%s' % hostname
20+
21 print 'Building recipe:'
22 print recipe
23 retcode = self.chroot([
24- 'sudo', '-iu', self.username, 'DEBEMAIL=%s' % self.author_email,
25- 'DEBFULLNAME=%s' % self.author_name.encode('utf-8'), 'bzr',
26+ 'sudo', '-i', '-u', self.username, 'DEBEMAIL=%s' % self.author_email,
27+ 'DEBFULLNAME=%s' % self.author_name.encode('utf-8'),
28+ 'BZR_EMAIL=%s' % bzr_email, 'bzr',
29 'dailydeb', '--no-build', recipe_path_relative,
30 self.tree_path_relative, '--manifest', manifest_path_relative,
31 '--append-version', '~%s1' % self.distroseries_name],
32@@ -127,6 +132,7 @@
33 if echo:
34 print "Running in chroot: %s" % ' '.join(
35 "'%s'" % arg for arg in args)
36+ sys.stdout.flush()
37 return call([
38 '/usr/bin/sudo', '/usr/sbin/chroot', self.chroot_path] + args)
39
40@@ -156,11 +162,6 @@
41 os.environ["HOME"], "build-" + build_id, *extra)
42
43 if __name__ == '__main__':
44- # As of bzr 2.2, a defined identity is needed. In this case, we're using
45- # buildd@<hostname>.
46- hostname = socket.gethostname()
47- os.environ['BZR_EMAIL'] = 'buildd@%s' % hostname
48-
49 builder = RecipeBuilder(*sys.argv[1:])
50 if builder.install() != 0:
51 sys.exit(RETCODE_FAILURE_INSTALL)
52
53=== modified file 'lib/canonical/buildd/debian/changelog'
54--- lib/canonical/buildd/debian/changelog 2010-08-16 19:29:00 +0000
55+++ lib/canonical/buildd/debian/changelog 2010-08-23 21:46:43 +0000
56@@ -1,3 +1,28 @@
57+launchpad-buildd (70) hardy-cat; urgency=low
58+
59+ [ LaMont Jones ]
60+ * Restore the rest of version 68.
61+
62+ [ James Westby ]
63+ * buildrecipe: Specify BZR_EMAIL via sudo so that the called command
64+ sees the environment variable.
65+ * buildrecipe: call sudo -i -u instead of sudo -iu so that it works with
66+ older versions of sudo.
67+ * buildrecipe: flush stdout before calling another command so that
68+ the build log has the output correctly interleaved.
69+
70+ [ William Grant ]
71+ * correct arch_tag arguments.
72+
73+ -- LaMont Jones <lamont@canonical.com> Fri, 20 Aug 2010 13:27:55 -0600
74+
75+launchpad-buildd (69) hardy-cat; urgency=low
76+
77+ * REVERT all of version 68 except for BZR_EMAIL LP#617072
78+ (Not reflected in bzr.)
79+
80+ -- LaMont Jones <lamont@canonical.com> Tue, 17 Aug 2010 10:40:03 -0600
81+
82 launchpad-buildd (68) hardy-cat; urgency=low
83
84 [ William Grant ]
85
86=== modified file 'lib/canonical/buildd/sbuild-package'
87--- lib/canonical/buildd/sbuild-package 2010-07-13 09:13:41 +0000
88+++ lib/canonical/buildd/sbuild-package 2010-08-23 21:46:43 +0000
89@@ -19,8 +19,8 @@
90
91 SBUILD=/usr/bin/sbuild
92 BUILDID=$1
93-SUITE=$2
94-ARCHITECTURETAG=$3
95+ARCHITECTURETAG=$2
96+SUITE=$3
97
98 shift 3
99