summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Staniewski <cedric@gmx.ca>2009-10-21 16:06:42 +0200
committerDan McGee <dan@archlinux.org>2009-12-15 04:39:24 +0100
commit335627d72dd5e51201b4cd53d84b70954946c013 (patch)
treea917ad873fba0909de32e405cc6980b0246867a0
parente09253d15b879f3375d57efd656e687a984ebc36 (diff)
downloadpacman-335627d72dd5e51201b4cd53d84b70954946c013.tar.gz
pacman-335627d72dd5e51201b4cd53d84b70954946c013.tar.xz
makepkg: check for non-empty pkgbase instead of pkgname
pkgbase is used in the following rm calls, and since pkgname can be present when pkgbase is not, it is safer to check for pkgbase. Signed-off-by: Cedric Staniewski <cedric@gmx.ca> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@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 13e4ed5e..929f43f9 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -155,7 +155,7 @@ clean_up() {
# If it's a clean exit and -c/--clean has been passed...
msg "$(gettext "Cleaning up...")"
rm -rf "$pkgdir" "$srcdir"
- if [ -n "$pkgname" ]; then
+ if [ -n "$pkgbase" ]; then
# Can't do this unless the BUILDSCRIPT has been sourced.
rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"*
if [ "$PKGFUNC" -eq 1 ]; then