summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2020-10-11 22:22:05 -0400
committerAllan McRae <allan@archlinux.org>2020-10-21 11:18:32 +1000
commitc99a3cc867ee5bf725a5d33d57120c3764aeb41e (patch)
treee4048e32b46e41b70c224c1916059e1ce67e4ce1
parentf76bd2c6c1b94792112d311ac53662d3d9b6821d (diff)
downloadpacman-c99a3cc867ee5bf725a5d33d57120c3764aeb41e.tar.gz
pacman-c99a3cc867ee5bf725a5d33d57120c3764aeb41e.zip
makepkg: properly localize some internal function variables
We leaked fullver and pkgarch all over the place, and only conditionally unset the other variables. Marking them local is a more proactive solution. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 9fe2d2e7..b39433f3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -862,6 +862,7 @@ install_package() {
}
check_build_status() {
+ local fullver pkgarch allpkgbuilt somepkgbuilt
if (( ! SPLITPKG )); then
fullver=$(get_full_version)
pkgarch=$(get_pkg_arch)
@@ -904,7 +905,6 @@ check_build_status() {
exit $E_ALREADY_BUILT
fi
fi
- unset allpkgbuilt somepkgbuilt
fi
}