[pacman-dev] [PATCH] makepkg: fix --verifysource (FS#35057)

William Giokas 1007380 at gmail.com
Wed May 1 23:44:51 EDT 2013


This should fix both the `use -f to override` and the dependency
checking.

Signed-off-by: William Giokas <1007380 at gmail.com>
---
 scripts/makepkg.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index edfca3c..9159b2c 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2836,7 +2836,7 @@ if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]];
 	fi
 fi
 
-if (( ! PKGVERFUNC )); then
+if (( ! PKGVERFUNC && ! VERIFYSOURCE )); then
 	check_build_status
 fi
 
@@ -2915,7 +2915,7 @@ if (( SOURCEONLY )); then
 	exit 0
 fi
 
-if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then
+if (( VERIFYSOURCE || NODEPS || (NOBUILD && !DEP_BIN ) )); then
 	# no warning message needed for nobuild
 	if (( NODEPS )); then
 		warning "$(gettext "Skipping dependency checks.")"
-- 
1.8.3.rc0.33.gde0977d



More information about the pacman-dev mailing list