From: Greg Brockman <gdb@mit.edu>
Date: Tue, 6 Jul 2010 04:27:19 +0000 (-0400)
Subject: Log and capture sbuild results
X-Git-Tag: 0.1.5~20
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/commitdiff_plain/1df2c5ee4af289b6c68d28b021cceaacecb61b61

Log and capture sbuild results

svn path=/trunk/packages/invirt-dev/; revision=3032
---

diff --git a/invirtibuilder b/invirtibuilder
index d2a571c..aa70b53 100755
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -113,11 +113,11 @@ def aptCopy(package, commit, dst_pocket, src_pocket):
 
 def sbuild(package, ref, arch, workdir, arch_all=False):
     """Build a package for a particular architecture."""
-    args = ['sbuild', '-d', DISTRIBUTION, '--arch', arch]
+    args = ['sbuild', '-v', '-d', DISTRIBUTION, '--arch', arch]
     if arch_all:
         args.append('-A')
     args.append(getDscName(package, ref))
-    c.captureOutput(args, cwd=workdir, stdout=None)
+    c.captureOutput(args, cwd=workdir)
 
 
 def sbuildAll(package, ref, workdir):
@@ -332,8 +332,8 @@ def build():
                         if not os.path.exists(logdir):
                             os.makedirs(logdir)
 
-                        for log in glob.glob(os.path.join(workdir, '*.build')):
-                            os.copy2(log, logdir)
+                        for log in glob.glob(os.path.join(workdir, 'build-*.log')):
+                            os.copy(log, logdir)
 
                     db.failed_stage = 'processing metadata'
                     env = dict(os.environ)