Re: [PATCH] Corrected return values in prep_for_email;
On 12/09/2010 07:24 AM, Alan Raison wrote:
Show 10 quoted lines
> From ebe98d1c682f268b39a7eaf3ef529accbf0ac61c Mon Sep 17 00:00:00 2001
> From: Alan Raison<alan@theraisons.me.uk>
> Date: Mon, 6 Dec 2010 15:49:21 +0000
> Subject: [PATCH] Corrected return values in prep_for_email;
>
> Function was returning 0 for failure and 1 for success which was breaking
> the logic in the main loop.
>
> Corrected to return 0 for success, 1 for failure. Function now also returns
> in all cases, rather than exiting.
Your commit message will need a Signed-Off-By line, but...
Acked-By: Kevin P. Fleming <kpfleming@digium.com>
Show 41 quoted lines
> ---
> contrib/hooks/post-receive-email | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/hooks/post-receive-email
> b/contrib/hooks/post-receive-email
> index 85724bf..f99ea95 100755
> --- a/contrib/hooks/post-receive-email
> +++ b/contrib/hooks/post-receive-email
> @@ -144,13 +144,13 @@ prep_for_email()
> short_refname=${refname##refs/remotes/}
> echo>&2 "*** Push-update of tracking branch,
> $refname"
> echo>&2 "*** - no email generated."
> - exit 0
> + return 1
> ;;
> *)
> # Anything else (is there anything else?)
> echo>&2 "*** Unknown type of update to $refname
> ($rev_type)"
> echo>&2 "*** - no email generated"
> - return 0
> + return 1
> ;;
> esac
>
> @@ -166,10 +166,10 @@ prep_for_email()
> esac
> echo>&2 "*** $config_name is not set so no email will be
> sent"
> echo>&2 "*** for $refname update $oldrev->$newrev"
> - return 0
> + return 1
> fi
>
> - return 1
> + return 0
> }
>
> #--
Kevin P. Fleming
Digium, Inc. | Director of Software Technologies
445 Jan Davis Drive NW - Huntsville, AL 35806 - USA
skype: kpfleming | jabber: kfleming@digium.com
Check us out at www.digium.com & www.asterisk.org