mirror of
https://github.com/moparisthebest/pacman
synced 2024-12-23 08:18:51 -05:00
Update Gensync and Updatesync to use new PKGEXT variable
Previously, this caused both scripts to look for pkgname-pkgver-pkgrel-arch..pkg.tar.gz - extra period has been removed. Fixes FS#9190. Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
47e8dd0670
commit
bbe02ec57f
@ -130,13 +130,13 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do
|
|||||||
CARCH='any'
|
CARCH='any'
|
||||||
fi
|
fi
|
||||||
if [ "$pkgdir" != "" ]; then
|
if [ "$pkgdir" != "" ]; then
|
||||||
pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
|
pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
|
||||||
else
|
else
|
||||||
pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
|
pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f "$pkgfile" ]; then
|
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
|
else
|
||||||
if check_force; then
|
if check_force; then
|
||||||
forcepkgs="$forcepkgs $pkgfile"
|
forcepkgs="$forcepkgs $pkgfile"
|
||||||
|
@ -127,10 +127,10 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
|
|||||||
if [ "$arch" = 'any' ]; then
|
if [ "$arch" = 'any' ]; then
|
||||||
CARCH='any'
|
CARCH='any'
|
||||||
fi
|
fi
|
||||||
pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT"
|
pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}"
|
||||||
|
|
||||||
if [ ! -f "$pkgfile" ]; then
|
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
|
fi
|
||||||
|
|
||||||
if check_force; then
|
if check_force; then
|
||||||
|
Loading…
Reference in New Issue
Block a user