[pacman-dev] [PATCH 2/2] makepkg: Fixed logging for split packages

[Eric Bélanger]

Signed-off-by: Eric Bélanger <snowmaniscool at gmail.com>
---
 scripts/makepkg.sh.in |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e2b28c1..180e128 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -142,7 +142,7 @@ clean_up() {
 				rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package.log"*
 			elif [ "$SPLITPKG" -eq 1 ]; then
 				for pkg in ${pkgname[@]}; do
-					rm -f "${pkg}-${pkgver}-${pkgrel}-${CARCH}-package.log"*
+					rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-package_${pkg}.log"*
 				done
 			fi
 		fi
@@ -707,6 +707,8 @@ run_function() {
 	msg "$(gettext "Starting %s()...")" "$pkgfunc"
 	cd "$srcdir"
 
+	local _pkgbase=$pkgbase
+
 	# ensure all necessary build variables are exported
 	export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST
 	# save our shell options so pkgfunc() can't override what we need
@@ -714,7 +716,7 @@ run_function() {
 
 	local ret=0
 	if [ "$LOGGING" -eq 1 ]; then
-		BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log"
+		BUILDLOG="${startdir}/${_pkgbase}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log"
 		if [ -f "$BUILDLOG" ]; then
 			local i=1
 			while true; do
-- 
1.6.5.2