[pacman-dev] [PATCH] fix for incorrect checking of return code, which causes syntax errors
Allan McRae
allan at archlinux.org
Sat May 15 20:13:46 EDT 2010
On 16/05/10 05:06, Dieter Plaetinck wrote:
> ---
> scripts/makepkg.sh.in | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index e8aaa8b..9741879 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -693,10 +693,10 @@ extract_sources() {
> local ret=0
> msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd"
> if [[ $cmd = bsdtar ]]; then
> - $cmd -xf "$file" || ret=?
> + $cmd -xf "$file" || ret=$?
> else
> rm -f "${file%.*}"
> - $cmd -dcf "$file"> "${file%.*}" || ret=?
> + $cmd -dcf "$file"> "${file%.*}" || ret=$?
> fi
> if (( ret )); then
> error "$(gettext "Failed to extract %s")" "$file"
Good catch. Pushed to my working branch.
You should commit patches with "-s" so that you get the signoff line.
Allan
More information about the pacman-dev
mailing list