do_merge: exit on build failure

we can just retsart do_merge in this case

diff --git a/do_merge b/do_merge
index a14b51ec4197809698c5e7180596370c08f57f7c..cecd32708ecf72fcf49d5fc5ac21f5168c1af333 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -35,7 +35,7 @@ execute()
        return "$_err"
 }
 
-fix_up()
+report()
 {
        if [ -n "$1" ]; then
                linux-next-notify "$1"
@@ -43,6 +43,11 @@ fix_up()
        if [ -n "$2" ]; then
                printf '%s\n' "$2" 1>&2
        fi
+}
+
+fix_up()
+{
+       report "$@"
        if ! bash -i; then
                exit
        fi
@@ -164,7 +169,8 @@ for h in $heads; do
                fix_up "pre-build script failed for $tree" "Prebuild script failed"
        fi
        if ! "$bin_dir/do_build" "$tree"; then
-               fix_up "build failed for $tree" "Build failed"
+               report "build failed for $tree" "Build failed - run do_merge when fixed"
+               exit 1
        fi
 
        need_build=false