From bfee7b63f923a134ac4847b44c0c451268fec65c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 26 Jul 2013 07:31:54 +0000 Subject: abump: error out on first faild package If some package fails, then stop processing the rest. This is so we don't risk test build the rest for the packages against wrong lib. For example, if 'abump libfoo-2.0 foo-2.0' fails on libfoo, we don't want testbuild foo-2.0, which might end with success against libfoo-1. We also echo the list of packages that was not bumped, so its easy to copy/paste next run. --- abump.in | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'abump.in') diff --git a/abump.in b/abump.in index 2b0ca01..eef57d5 100755 --- a/abump.in +++ b/abump.in @@ -18,10 +18,14 @@ fi # version bump packages do_bump() { - local p rc=0 errors=0 failed= name ver section message + local p rc=0 notbumped="" name ver section message local upgrade="${cvelist:+security }upgrade" local a for p; do + if [ $rc -gt 0 ]; then + notbumped="$notbumped $p" + continue + fi name=${p%-[0-9]*} ver=${p#${name}-} @@ -64,15 +68,15 @@ fixes #${fixes#\#} git add APKBUILD git commit -m"$message" ) - if [ $? -ne 0 ]; then - errors=$(( $errors + 1 )) - failed="$failed $p" + rc=$? + if [ $rc -gt 0 ]; then + error "Failed to build $p" fi done - if [ -n "$failed" ]; then - error "Failed: $failed" + if [ -n "$notbumped" ]; then + error "Not bumped: $notbumped" fi - return $errors + return $rc } usage() { -- cgit v1.2.3