From 8064f76d94a030276f144a940f85a2a85cbdd42b Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 20 Jan 2019 17:58:36 +0100 Subject: [PATCH] build-package.sh: fix termux_step_compare_debs Catch error if termux_download_deb fails --- build-package.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build-package.sh b/build-package.sh index 1719cd27f2..9ee240ec24 100755 --- a/build-package.sh +++ b/build-package.sh @@ -1476,16 +1476,17 @@ termux_step_create_debfile() { termux_step_compare_debs() { if [ "${TERMUX_INSTALL_DEPS}" = true ]; then - local arch version cd ${TERMUX_SCRIPTDIR} if [ ! "$TERMUX_QUIET_BUILD" = true ]; then echo "COMPARING PACKAGES"; fi - termux_download_deb $(basename $TERMUX_PKG_BUILDER_DIR) $TERMUX_ARCH $TERMUX_PKG_FULLVERSION - deb_file=${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb + termux_download_deb $TERMUX_PKG_NAME $TERMUX_ARCH $TERMUX_PKG_FULLVERSION \ + && ( + deb_file=${TERMUX_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${TERMUX_ARCH}.deb - # `|| true` to prevent debdiff's exit code from stopping build - debdiff $TERMUX_DEBDIR/$deb_file $TERMUX_COMMON_CACHEDIR-$TERMUX_ARCH/$deb_file || true - if [ ! "$TERMUX_QUIET_BUILD" = true ]; then echo "DONE COMPARING PACKAGES"; fi + # `|| true` to prevent debdiff's exit code from stopping build + debdiff $TERMUX_DEBDIR/$deb_file $TERMUX_COMMON_CACHEDIR-$TERMUX_ARCH/$deb_file || true + if [ ! "$TERMUX_QUIET_BUILD" = true ]; then echo "DONE COMPARING PACKAGES"; fi + ) || echo "Download of ${TERMUX_PKG_NAME}@${TERMUX_PKG_FULLVERSION} failed, not comparing debs" fi }