From 49133f9b62d761ec06cd5c09d5287967dfe91f9d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 23 Jul 2014 15:19:16 +0200 Subject: [PATCH] hooks/gen-pkg: use local vars for 32bit provides conversion. --- common/hooks/do-pkg/00-gen-pkg.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh index ed5d714f04d..b4c42d4d2b2 100644 --- a/common/hooks/do-pkg/00-gen-pkg.sh +++ b/common/hooks/do-pkg/00-gen-pkg.sh @@ -112,7 +112,7 @@ genpkg() { } hook() { - local arch= binpkg= repo= _pkgver= _desc= + local arch= binpkg= repo= _pkgver= _desc= _pkgn= _pkgv= _provides= _replaces= if [ -n "$noarch" ]; then arch=noarch @@ -150,11 +150,10 @@ hook() { return fi if [ -d "${XBPS_DESTDIR}/${pkgname}-32bit-${version}" ]; then - unset pkgn pkgv _provides _replaces for f in ${provides}; do - pkgn="$($XBPS_UHELPER_CMD getpkgname $f)" - pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)" - _provides+=" ${pkgn}-32bit-${pkgv}" + _pkgn="$($XBPS_UHELPER_CMD getpkgname $f)" + _pkgv="$($XBPS_UHELPER_CMD getpkgversion $f)" + _provides+=" ${_pkgn}-32bit-${_pkgv}" done source ${XBPS_COMMONDIR}/environment/setup-subpkg/subpkg.sh if [ -n "$nonfree" ]; then