summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Staniewski <cedric@gmx.ca>2009-10-21 16:06:42 +0200
committerDan McGee <dan@archlinux.org>2009-10-24 16:56:07 +0200
commit1000c0bd2eb84582e5ef60cde6ea937ab9e4b0e9 (patch)
tree1de5a17d7c485e359938cd550fe5a27fe3cc4a98
parent6ed7d001f6783907d762514dab0741f98d22d715 (diff)
downloadpacman-1000c0bd2eb84582e5ef60cde6ea937ab9e4b0e9.tar.gz
pacman-1000c0bd2eb84582e5ef60cde6ea937ab9e4b0e9.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 78b69047..a9bbf14c 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -156,7 +156,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