From 7003b5eb708dd6722c583fcc825db04000847038 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Apr 2022 19:17:33 +0200 Subject: [PATCH] contrib: don't abort on first error during `ftpadmin install` With "rc1" mode, we install more than one tarballs (the one for 1.37.90 and 1.39.0). If we reach this point, we already pushed the git tags. There is no way back. Ignore errors at first and try to release all tarballs. Only signal the error at the end. --- contrib/fedora/rpm/release.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index 9b2ba5ea8c..e653509869 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -548,9 +548,13 @@ done do_command git push "$ORIGIN" "${BRANCHES[@]}" || die "failed to to push branches ${BRANCHES[@]} to $ORIGIN" +FAIL=0 for r in "${RELEASE_FILES[@]}"; do - do_command ssh master.gnome.org ftpadmin install --unattended "$r" || die "ftpadmin install failed" + do_command ssh master.gnome.org ftpadmin install --unattended "$r" || FAIL=1 done +if [ "$FAIL" = 1 ]; then + die "ftpadmin install failed. This was the last step. Invoke the command manually" +fi CLEANUP_CHECKOUT_BRANCH= if [ "$DRY_RUN" = 0 ]; then