summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2019-01-04 04:13:16 +0100
committerAllan McRae <allan@archlinux.org>2019-01-04 06:43:41 +0100
commitc5c7fc7f4a361a9a347845b930030077898cd83f (patch)
treeb0779dce1ebf168f4bc8d01d10296cb2d2619db6 /scripts
parent2f15921230a424c57c13dc0ba0776d87c2f590c4 (diff)
downloadpacman-c5c7fc7f4a361a9a347845b930030077898cd83f.tar.gz
pacman-c5c7fc7f4a361a9a347845b930030077898cd83f.tar.xz
makepkg: Make pkgdir a local
Causes it to be reset (to $pkgdirbase/$pkgbase) between subpackages. This shouldn't be visible. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e3a392d4..237d1cdb 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -739,7 +739,7 @@ create_debug_package() {
return 0
fi
- pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@"
+ local pkgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@"
# check if we have any debug symbols to package
if dir_is_empty "$pkgdir/usr/lib/debug"; then
@@ -923,7 +923,7 @@ restore_package_variables() {
}
run_single_packaging() {
- pkgdir="$pkgdirbase/$pkgname"
+ local pkgdir="$pkgdirbase/$pkgname"
mkdir "$pkgdir"
if [[ -n $1 ]] || (( PKGFUNC )); then
run_package $1