[pacman-dev] [PATCH] makepkg: don't run remove_deps twice when unneeded

[Allan McRae]

On 16/03/13 03:11, William Giokas wrote:
> remove_deps already has a check and won't run unless -r is specified, so
> if this was meant to remove dependencies of a failure no matter what,
> then it's not doing it, and with -r it is run twice on a failure for no
> real reason.
> 
> Signed-off-by: William Giokas <1007380 at gmail.com>
> ---
>  scripts/makepkg.sh.in | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 73f45d4..3bcc527 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1356,7 +1356,6 @@ error_function() {
>  	if (( ! BASH_SUBSHELL )); then
>  		error "$(gettext "A failure occurred in %s().")" "$1"
>  		plain "$(gettext "Aborting...")"
> -		remove_deps
>  	fi
>  	exit 2 # $E_BUILD_FAILED
>  }
> 

Ack.   I should have included this in the 4.1 release...   -> maint.

Allan