[pacman-dev] [PATCH] Return zero from extract_file with local source file
The call to bsdtar to check if a file needs extracted returns 1 if it does not. We then propegate this return value accientally which can cause makepkg to report an error later on. Explicitly return 0 in this case. Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0fc71c0..401d681 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -419,7 +419,7 @@ extract_file() { if bsdtar -tf "$file" -q '*' &>/dev/null; then cmd="bsdtar" else - return + return 0 fi ;; esac -- 1.8.4.2
The extract_sources function should be just extracting sources. Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/makepkg.sh.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 401d681..446e1de 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1359,11 +1359,6 @@ extract_sources() { ;; esac done - - if (( PKGVERFUNC )); then - update_pkgver - check_build_status - fi } error_function() { @@ -3004,6 +2999,10 @@ elif (( !REPKG )); then fi extract_sources + if (( PKGVERFUNC )); then + update_pkgver + check_build_status + fi if (( PREPAREFUNC )); then run_prepare fi -- 1.8.4.2
participants (1)
-
Allan McRae