← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rockstar/launchpad/maverick-builds-oh-no into lp:launchpad/devel

 

Paul Hummer has proposed merging lp:~rockstar/launchpad/maverick-builds-oh-no into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #617072 Maverick recipe builds fail
  https://bugs.launchpad.net/bugs/617072


Fix bug #617072
-- 
https://code.launchpad.net/~rockstar/launchpad/maverick-builds-oh-no/+merge/32525
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rockstar/launchpad/maverick-builds-oh-no into lp:launchpad/devel.
=== modified file 'lib/canonical/buildd/buildrecipe'
--- lib/canonical/buildd/buildrecipe	2010-07-08 20:18:39 +0000
+++ lib/canonical/buildd/buildrecipe	2010-08-12 22:11:03 +0000
@@ -10,6 +10,7 @@
 import os
 import os.path
 import pwd
+import socket
 from subprocess import call
 import sys
 
@@ -155,6 +156,11 @@
         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)