launchpad-reviewers team mailing list archive

[Martin Pool <mbp@xxxxxxxxxxxxx>]

Martin Pool has proposed merging lp:~mbp/launchpad/884092-buildd-versions into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #884092 in Launchpad itself: "source recipe build logs should mention versions used"
  https://bugs.launchpad.net/launchpad/+bug/884092

For more details, see:
https://code.launchpad.net/~mbp/launchpad/884092-buildd-versions/+merge/80870

Per bug 884092 this tries to make it easier to understand recipe build problems by logging the versions of bzr and plugins used.

-- 
https://code.launchpad.net/~mbp/launchpad/884092-buildd-versions/+merge/80870
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~mbp/launchpad/884092-buildd-versions into lp:launchpad.

=== modified file 'lib/canonical/buildd/buildrecipe'
--- lib/canonical/buildd/buildrecipe	2011-02-09 21:10:55 +0000
+++ lib/canonical/buildd/buildrecipe	2011-11-01 07:23:29 +0000
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+#! /usr/bin/env python -u
+# Copyright 2010, 2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """A script that builds a package from a recipe and a chroot."""
@@ -12,7 +12,10 @@
 import pwd
 from resource import RLIMIT_AS, setrlimit
 import socket
-from subprocess import call
+from subprocess import (
+    call,
+    check_call,
+    )
 import sys
 
 
@@ -92,6 +95,10 @@
         hostname = socket.gethostname()
         bzr_email = 'buildd@%s' % hostname
 
+        print 'Bazaar versions:'
+        check_call(['bzr', 'version'])
+        check_call(['bzr', 'plugins'])
+
         print 'Building recipe:'
         print recipe
         sys.stdout.flush()