[pacman-dev] [PATCH] add 'force' to PKGINFO, have repo-add respect it.

[Dan McGee]

On Feb 2, 2008 4:50 PM, Chantry Xavier <shiningxc at gmail.com> wrote:
> Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-January/011023.html
>
> Signed-off-by: Chantry Xavier <shiningxc at gmail.com>
> ---
>  scripts/makepkg.sh.in  |    3 +++
>  scripts/repo-add.sh.in |    4 ++--
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 0997386..68ad597 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -810,6 +810,9 @@ create_package() {
>         if [ "$CARCH" != "" ]; then
>                 echo "arch = $CARCH" >>.PKGINFO
>         fi
> +       if [ "$(check_option force)" = "y" ]; then
> +               echo "force = true" >> .PKGINFO
> +       fi
Good.

>
>         local it
>         for it in "${license[@]}"; do
> diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
> index c37a12f..efd3bc0 100644
> --- a/scripts/repo-add.sh.in
> +++ b/scripts/repo-add.sh.in
> @@ -136,7 +136,7 @@ db_write_entry()
>         # blank out all variables and set pkgfile
>         local pkgfile=$(readlink -f "$1")
>         local pkgname pkgver pkgdesc url builddate packager csize size \
> -               group depend backup license replaces provides conflict \
> +               group depend backup license replaces provides conflict force \
>                 _groups _depends _backups _licenses _replaces _provides _conflicts \
>                 startdir
>
> @@ -209,7 +209,7 @@ db_write_entry()
>         [ -n "$builddate" ] && echo -e "%BUILDDATE%\n$builddate\n" >>desc
>         [ -n "$packager" ] && echo -e "%PACKAGER%\n$packager\n" >>desc
>         write_list_entry "REPLACES" "$_replaces" "desc"
> -       [ $FORCE -eq 1 ] && echo -e "%FORCE%\n" >>desc
> +       [ $FORCE -eq 1 -o -n "$force" ] && echo -e "%FORCE%\n" >>desc

Seems good to me. Master or maint for this one? Asking anyone on the
list that has an opinion. Being that it is non-intrusive for most
people, I'm fine with maint.

-Dan