From 8850981d7362f95623b58d5af34343f1f8395eb6 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 13 Mar 2019 13:42:06 -0400 Subject: ob-*: Add return statements after ob_error() calls --- (limited to 'src/ob-applypatches.sh') diff --git a/src/ob-applypatches.sh b/src/ob-applypatches.sh index 2650223..90ccc3d 100644 --- a/src/ob-applypatches.sh +++ b/src/ob-applypatches.sh @@ -38,8 +38,10 @@ apply_patches() patch="${patch#../patches/}" ob_info "$(ob_get_msg 'applying_patch')" "${patch}" cd src - patch -N -p 1 -u -i "../../patches/${patch}" || \ + if ! patch -N -p 1 -u -i "../../patches/${patch}"; then ob_error "$(ob_get_msg 'cant_apply_patch')" "${patch}" + return 1 + fi cd .. applied='true' done @@ -47,6 +49,8 @@ apply_patches() fi ${applied} || ob_info "$(ob_get_msg 'no_patches')" + + return 0 } main() @@ -56,7 +60,9 @@ main() ob_init_package '..' || exit 1 ob_parse_package_metadata -c '.opkbuild.cache' || exit 1 - apply_patches + apply_patches || return 1 + + return 0 } main "${@}" -- cgit v0.9.1