Merge pull request #1417 from citrus-it/framework

Framework updates from omnios-build

Author: oetiker

.gitignore

@@ -2,6 +2,7 @@ build.log
 build-*.log
 build.log.*
 build-*.log.*
+last-failure.log
 tmp.repo/
 tmp.repo.aarch64/
 *.p5m.final

build/buildctl

@@ -309,8 +309,12 @@ build() {
             LOGFILE="$_LOGFILE"
             built_packages_p5m $SCRIPT
         else
-            PATH=$PATH:. $SCRIPT -r $PKGSRVR $build_flags $extra_flags || \
+            PATH=$PATH:. $SCRIPT -r $PKGSRVR $build_flags $extra_flags
+            if (($? != 0)); then
+                typeset log="`ls -1tr *.log | tail -1`"
+                [ -n "$log" ] && cp "$log" ../last-failure.log
                 logerr "Unable to run $SCRIPT"
+            fi
             [ -z "$extra_flags" ] && built_packages_sh $SCRIPT
         fi
         popd >/dev/null
@@ -434,13 +438,19 @@ reap_slot() {
     typeset -i ret=0
 
     case $stat in
-        0)  logmsg -n "-- Job $slot ($job) terminated normally"
-            ;;
-        *)  logmsg -e "-- Job $slot ($job) terminated with status $stat"
-            note -e "***** BUILD ERROR ***** ($job/$stat)"
-            builderr+=($job)
-            ret=1
-            ;;
+        0)      logmsg -n "-- Job $slot ($job) terminated normally"
+                ;;
+        127)    logmsg -e "-- Job $slot ($job) terminated with status $stat"
+                # 127 is not considered an error because it reflects a job
+                # which went away while we were not waiting for something to
+                # exit. That race may be worth closing some day but for now
+                # move on.
+                ;;
+        *)      logmsg -e "-- Job $slot ($job) terminated with status $stat"
+                note -e "***** BUILD ERROR ***** ($job/$stat)"
+                builderr+=($job)
+                ret=1
+                ;;
     esac
     unset slots[$slot]
     return $ret
@@ -746,6 +756,9 @@ parallel_build() {
 
     date
     logmsg "Total build time: $(print_elapsed $((`date +%s` - build_start)))"
+
+    [ -n "$builderr" ] && return 1
+    return 0
 }
 
 usage() {
@@ -913,6 +926,5 @@ case "$1" in
         ;;
 esac
 
-
 # Vim hints
 # vim:ts=4:sw=4:et: