[pacman-dev] [PATCH 01/11] makepkg: fix variable checks when writing pkginfo

[Dan McGee]

On Thu, Jun 17, 2010 at 7:44 AM, Andres P <aepd87 at gmail.com> wrote:
> Regression in c71fe7db checked for wrong variables when populating .PKGINFO.
>
> Signed-off-by: Andres P <aepd87 at gmail.com>
> ---

I'm having a real hard time picking out what changed here. Mind
explaining a bit more what changed?

Actually, now i might see it, but your re-indenting the whole block
made it non-obvious. Something as simple as this in the commit message
would save us all 3 minutes of staring:

The 'optdepend' and 'conflict' variables were singular instead of plural.

Looks good to me otherwise, as long as this note ends up in the commit message.

>  scripts/makepkg.sh.in |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 678359f..d0b8b4b 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -923,14 +923,14 @@ write_pkginfo() {
>                echo "force = true"
>        fi
>
> -       [[ $license ]]   && printf "license = %s\n"   "${license[@]}"
> -       [[ $replaces ]]  && printf "replaces = %s\n"  "${replaces[@]}"
> -       [[ $groups ]]    && printf "group = %s\n"     "${groups[@]}"
> -       [[ $depends ]]   && printf "depend = %s\n"    "${depends[@]}"
> -       [[ $optdepend ]] && printf "optdepend = %s\n" "${optdepends[@]}"
> -       [[ $conflict ]]  && printf "conflict = %s\n"  "${conflicts[@]}"
> -       [[ $provides ]]  && printf "provides = %s\n"  "${provides[@]}"
> -       [[ $backup ]]    && printf "backup = %s\n"    "${backup[@]}"
> +       [[ $license ]]    && printf "license = %s\n"   "${license[@]}"
> +       [[ $replaces ]]   && printf "replaces = %s\n"  "${replaces[@]}"
> +       [[ $groups ]]     && printf "group = %s\n"     "${groups[@]}"
> +       [[ $depends ]]    && printf "depend = %s\n"    "${depends[@]}"
> +       [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]}"
> +       [[ $conflicts ]]  && printf "conflict = %s\n"  "${conflicts[@]}"
> +       [[ $provides ]]   && printf "provides = %s\n"  "${provides[@]}"
> +       [[ $backup ]]     && printf "backup = %s\n"    "${backup[@]}"
>
>        for it in "${packaging_options[@]}"; do
>                local ret="$(check_option $it)"
> --
> 1.7.1
>
>
>