bin/mdw-sbuild-server: Catch failures from parallel builds.

The way the log messages were interleaved made catching errors
difficult.  Do something more complicated to make it work properly.

diff --git a/bin/mdw-sbuild-server b/bin/mdw-sbuild-server
index a1355b81ca8a276cb9f5f7628765344d1f5e4138..26043e6b9c41fefc44b2d807bc9db3b5909845da 100755 (executable)
--- a/bin/mdw-sbuild-server
+++ b/bin/mdw-sbuild-server
@@ -235,23 +235,36 @@ case "$#,$1" in
 DSC = $dsc
 FIRST = $first
 REST = $rest
 DSC = $dsc
 FIRST = $first
 REST = $rest

-SBUILD = t=\$@; sbuild \\
-       --dist=\$\${t%-*} --arch=\$\${t\#*-} \\
-       --chroot=\$@ --verbose
-TAGLINES = \\
-       while IFS= read -r line; do printf "%s: %s\n" "\$@" "\$\$line"; done
+sbuild-wrap = \\
+       t=\$@; \\
+       { echo started >build-status.\$\$t; \\
+         sbuild \\
+               --dist=\$\${t%-*} --arch=\$\${t\#*-} \\
+               --chroot=\$@ --verbose \$1 \$(DSC); \\
+         rc=\$\$?; case \$\$rc in \\
+           0) echo ok >build-status.\$\$t ;; \\
+           *) echo failed rc=\$\$rc >build-status.\$\$t ;; \\
+         esac; } | \\
+       while IFS= read -r line; do \\
+         printf "%s: %s\n" "\$\$t" "\$\$line"; \\
+       done; \\
+       read st _ <build-status.\$\$t && \\
+       case \$\$st in ok) exit 0 ;; *) exit 1 ;; esac

 all: \$(FIRST) \$(REST)
 all: \$(FIRST) \$(REST)

-\$(FIRST):; \$(SBUILD) $firstopt \$(DSC) | \$(TAGLINES)
-\$(REST):; \$(SBUILD) --no-arch-all \$(DSC) | \$(TAGLINES)
+\$(FIRST):; \$(call sbuild-wrap,$firstopt)
+\$(REST):; \$(call sbuild-wrap,--no-arch-all)

 EOF
 
 EOF
 

+    ## Make some marker files to say things are in progress.
+    for i in $first $rest; do echo "starting" >build-status.$i; done
+

     ## And we're ready to go.
     mkfifo pipeout
     cat pipeout& catpid=$!
     set +e; make -fbuild.mk $parallel $makeopts -k all >pipeout
     rc=$?; set -e
     wait $!
     ## And we're ready to go.
     mkfifo pipeout
     cat pipeout& catpid=$!
     set +e; make -fbuild.mk $parallel $makeopts -k all >pipeout
     rc=$?; set -e
     wait $!

-    rm build.mk pipeout
+    rm build.mk pipeout build-status.*

     find . -maxdepth 1 -type l -exec rm {} \;
     exit $rc
     ;;
     find . -maxdepth 1 -type l -exec rm {} \;
     exit $rc
     ;;