[pacman-dev] [PATCH] makepkg: clarify aborting on packaging failure

[Thomas Bächler]

Am 30.06.2010 15:09, schrieb Allan McRae:
> When makepkg catches a command failure it currently prints "Aborting..."
> and exits.  Clarify the reason for aborting from packaging is a failure
> during one of the PKGBUILDs functions.
> 
> Signed-off-by: Allan McRae <allan at archlinux.org>

Signed-off-by: Thomas Bächler <thomas at archlinux.org>

I was very confused when I saw that 'plain' error message for the first
time, thought maybe makepkg had crashed or something.

This is much better and way less scary (as it includes the fancy colored
==>).

> ---
> 
> The error now looks like:
> ==> ERROR: A failure occurred in package().
>     Aborting...
> 
>  scripts/makepkg.sh.in |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index cbc344d..fdedc89 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -721,6 +721,7 @@ error_function() {
>  	fi
>  	# first exit all subshells, then print the error
>  	if (( ! BASH_SUBSHELL )); then
> +		error "$(gettext "A failure occurred in %s().")" "$1"
>  		plain "$(gettext "Aborting...")"
>  		remove_deps
>  	fi
> @@ -768,7 +769,7 @@ run_function() {
>  		tee "$BUILDLOG" < "$logpipe" &
>  		exec 1>"$logpipe" 2>"$logpipe"
>  		restoretrap=$(trap -p ERR)
> -		trap 'error_function' ERR
> +		trap 'error_function $pkgfunc' ERR
>  		$pkgfunc 2>&1
>  		eval $restoretrap
>  		sync
> @@ -776,7 +777,7 @@ run_function() {
>  		rm "$logpipe"
>  	else
>  		restoretrap=$(trap -p ERR)
> -		trap 'error_function' ERR
> +		trap 'error_function $pkgfunc' ERR
>  		$pkgfunc 2>&1
>  		eval $restoretrap
>  	fi


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 262 bytes
Desc: OpenPGP digital signature
URL: <http://mailman.archlinux.org/pipermail/pacman-dev/attachments/20100630/1f620ce7/attachment.bin>