From d547e90018c0643fcbff850551d50188829d4a4c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 5 Jan 2020 08:24:52 +0100 Subject: [PATCH] hooks/do-extract: 00-distfiles.sh: disable trap on ERR. --- common/hooks/do-extract/00-distfiles.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh index d1f457edcc5..8b0a5e0dc84 100644 --- a/common/hooks/do-extract/00-distfiles.sh +++ b/common/hooks/do-extract/00-distfiles.sh @@ -24,6 +24,9 @@ hook() { mkdir -p ${wrksrc} || msg_error "$pkgver: failed to create wrksrc.\n" fi + # Disable trap on ERR; the code is smart enough to report errors and abort. + trap - ERR + TAR_CMD="$(command -v bsdtar)" [ -z "$TAR_CMD" ] && TAR_CMD="$(command -v tar)" [ -z "$TAR_CMD" ] && msg_error "xbps-src: no suitable tar cmd (bsdtar, tar)\n"