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

[James Westby]

[Jelmer Vernooij (jelmer)]

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)

=== 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 @@
 
 
 import os
-import os.path
 import pwd
 import socket
 from subprocess import call
@@ -76,11 +75,17 @@
             recipe = recipe_file.read()
         finally:
             recipe_file.close()
+        # As of bzr 2.2, a defined identity is needed.  In this case, we're using
+        # buildd@<hostname>.
+        hostname = socket.gethostname()
+        bzr_email = 'buildd@%s' % hostname
+
         print 'Building recipe:'
         print recipe
         retcode = self.chroot([
-            'sudo', '-iu', self.username, 'DEBEMAIL=%s' % self.author_email,
-            'DEBFULLNAME=%s' % self.author_name.encode('utf-8'), 'bzr',
+            'sudo', '-i', '-u', self.username, 'DEBEMAIL=%s' % self.author_email,
+            'DEBFULLNAME=%s' % self.author_name.encode('utf-8'),
+            'BZR_EMAIL=%s' % bzr_email, 'bzr',
             'dailydeb', '--no-build', recipe_path_relative,
             self.tree_path_relative, '--manifest', manifest_path_relative,
             '--append-version', '~%s1' % self.distroseries_name],
@@ -127,6 +132,7 @@
         if echo:
             print "Running in chroot: %s" % ' '.join(
                 "'%s'" % arg for arg in args)
+            sys.stdout.flush()
         return call([
             '/usr/bin/sudo', '/usr/sbin/chroot', self.chroot_path] + args)
 
@@ -156,11 +162,6 @@
         os.environ["HOME"], "build-" + build_id, *extra)
 
 if __name__ == '__main__':
-    # As of bzr 2.2, a defined identity is needed.  In this case, we're using
-    # buildd@<hostname>.
-    hostname = socket.gethostname()
-    os.environ['BZR_EMAIL'] = 'buildd@%s' % hostname
-
     builder = RecipeBuilder(*sys.argv[1:])
     if builder.install() != 0:
         sys.exit(RETCODE_FAILURE_INSTALL)

=== 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 @@
+launchpad-buildd (70) hardy-cat; urgency=low
+
+  [ LaMont Jones ]
+  * Restore the rest of version 68.
+
+  [ James Westby ]
+  * buildrecipe: Specify BZR_EMAIL via sudo so that the called command
+    sees the environment variable.
+  * buildrecipe: call sudo -i -u instead of sudo -iu so that it works with
+    older versions of sudo.
+  * buildrecipe: flush stdout before calling another command so that
+    the build log has the output correctly interleaved.
+
+  [ William Grant ]
+  * correct arch_tag arguments.
+
+ -- LaMont Jones <[e-mail]>  Fri, 20 Aug 2010 13:27:55 -0600
+
+launchpad-buildd (69) hardy-cat; urgency=low
+
+  * REVERT all of version 68 except for BZR_EMAIL LP#617072
+    (Not reflected in bzr.)
+
+ -- LaMont Jones <[e-mail]>  Tue, 17 Aug 2010 10:40:03 -0600
+
 launchpad-buildd (68) hardy-cat; urgency=low
 
   [ William Grant ]

=== 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 @@
 
 SBUILD=/usr/bin/sbuild
 BUILDID=$1
-SUITE=$2
-ARCHITECTURETAG=$3
+ARCHITECTURETAG=$2
+SUITE=$3
 
 shift 3