[pacman-dev] [PATCH] Update Gensync and Updatesync to use new PKGEXT variable, which includes leading period.

[Dan McGee]

On Jan 13, 2008 6:42 AM, Travis Willard <travis at archlinux.org> wrote:
> Previously, this caused both scripts to look for pkgname-pkgver-pkgrel-arch..pkg.tar.gz - extra period has been removed
>
> Fixes FS9190
>
> Signed-off-by: Travis Willard <travis at archlinux.org>
> ---
>  scripts/gensync.sh.in    |    6 +++---
>  scripts/updatesync.sh.in |    4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/gensync.sh.in b/scripts/gensync.sh.in
> index b49c26e..04f8002 100644
> --- a/scripts/gensync.sh.in
> +++ b/scripts/gensync.sh.in
> @@ -130,13 +130,13 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do
>                 CARCH='any'
>         fi
>         if [ "$pkgdir" != "" ]; then
> -               pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
> +               pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
>         else
> -               pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
> +               pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
>         fi
>
>         if [ ! -f "$pkgfile" ]; then
> -               error "$(gettext "could not find %s-%s-%s-%s.%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
> +               error "$(gettext "could not find %s-%s-%s-%s%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
>         else
>                 if check_force; then
>                         forcepkgs="$forcepkgs $pkgfile"
> diff --git a/scripts/updatesync.sh.in b/scripts/updatesync.sh.in
> index 2e47ac9..900f11f 100644
> --- a/scripts/updatesync.sh.in
> +++ b/scripts/updatesync.sh.in
> @@ -127,10 +127,10 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
>         if [ "$arch" = 'any' ]; then
>                 CARCH='any'
>         fi
> -       pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
> +       pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
>
>         if [ ! -f "$pkgfile" ]; then
> -               die "$(gettext "could not find %s-%s-%s-%s.%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
> +               die "$(gettext "could not find %s-%s-%s-%s%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
>         fi
>
>         if check_force; then
> --
> 1.5.3.7

Great catch- I'll pull this one into maint.

-Dan