Log and capture sbuild results

[invirt/packages/invirt-dev.git] / invirtibuilder

diff --git a/invirtibuilder b/invirtibuilder
index d2a571c..aa70b53 100755 (executable)
--- 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."""
 
 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))
     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):
 
 
 def sbuildAll(package, ref, workdir):

@@ -332,8 +332,8 @@ def build():
                         if not os.path.exists(logdir):
                             os.makedirs(logdir)
 
                         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)
 
                     db.failed_stage = 'processing metadata'
                     env = dict(os.environ)