Merge pull request #1619 from litghost/defer_db_check_return

Defer exiting for db-check error until after cleanup.
This commit is contained in:
litghost 2021-03-15 08:37:51 -07:00 committed by GitHub
commit 9dd35a33ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions

View File

@ -169,7 +169,10 @@ echo "----------------------------------------"
echo "----------------------------------------" echo "----------------------------------------"
# Check the database and fail if it is broken. # Check the database and fail if it is broken.
set -x +e
make db-check-${XRAY_SETTINGS} make db-check-${XRAY_SETTINGS}
CHECK_RET=$?
set +x -e
echo echo
echo "========================================" echo "========================================"
@ -200,3 +203,5 @@ echo "========================================"
echo " Final disk space after cleanup" echo " Final disk space after cleanup"
echo "----------------------------------------" echo "----------------------------------------"
du -sh du -sh
exit $CHECK_RET