On Thu, Jun 17, 2010 at 7:44 AM, Andres P <[email protected]> wrote:
> Regression in c71fe7db checked for wrong variables when populating .PKGINFO.
>
> Signed-off-by: Andres P <[email protected]>
> ---
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" "${licen...@]}"
> - [[ $replaces ]] && printf "replaces = %s\n" "${replac...@]}"
> - [[ $groups ]] && printf "group = %s\n" "${grou...@]}"
> - [[ $depends ]] && printf "depend = %s\n" "${depen...@]}"
> - [[ $optdepend ]] && printf "optdepend = %s\n" "${optdepen...@]}"
> - [[ $conflict ]] && printf "conflict = %s\n" "${conflic...@]}"
> - [[ $provides ]] && printf "provides = %s\n" "${provid...@]}"
> - [[ $backup ]] && printf "backup = %s\n" "${back...@]}"
> + [[ $license ]] && printf "license = %s\n" "${licen...@]}"
> + [[ $replaces ]] && printf "replaces = %s\n" "${replac...@]}"
> + [[ $groups ]] && printf "group = %s\n" "${grou...@]}"
> + [[ $depends ]] && printf "depend = %s\n" "${depen...@]}"
> + [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepen...@]}"
> + [[ $conflicts ]] && printf "conflict = %s\n" "${conflic...@]}"
> + [[ $provides ]] && printf "provides = %s\n" "${provid...@]}"
> + [[ $backup ]] && printf "backup = %s\n" "${back...@]}"
>
> for it in "${packaging_optio...@]}"; do
> local ret="$(check_option $it)"
> --
> 1.7.1
>
>
>
