New subject: [pacman-dev] [PATCH] makepkg: move update_pkgver out of extract_sources

1 Nov 2013

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 
---
 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

    

[pacman-dev] [PATCH] Return zero from extract_file with local source file

Allan McRae

Allan McRae

tags

participants (1)