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

Allan McRae allan at archlinux.org
Wed May 1 23:56:18 EDT 2013


On 02/05/13 13:44, William Giokas wrote:
> 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

Fine.

> @@ -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.")"

I have been thinking about this...   Your VCS tool will be in
makedepends and needed to download those sources.

Allan



More information about the pacman-dev mailing list