From 76f3ac4058ab7747efd0d91ec34cbe883a946fe0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 24 Mar 2017 11:30:57 +0000
Subject: abuild: fix -K option

make sure we don't delete files when -K is specified

fixes #7008
---
 abuild.in | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/abuild.in b/abuild.in
index a34ba2d..7cef63f 100644
--- a/abuild.in
+++ b/abuild.in
@@ -78,8 +78,8 @@ want_check() {
 cleanup() {
 	local i=
 	[ -z "$subpkgdir" ] && set_xterm_title ""
-	if [ -n "$CLEANUP_FILES" ]; then
-		rm -f $CLEANUP_FILES
+	if [ -n "$keep_build" ]; then
+		return 0
 	fi
 	for i; do
 		case $i in
@@ -1637,7 +1637,7 @@ rootpkg() {
 	cd "$startdir"
 	rm -rf "$pkgdir"
 	[ -n "$FAKEROOT" ] && msg "Entering fakeroot..."
-	do_fakeroot "$abuild_path" $color_opt \
+	do_fakeroot "$abuild_path" $color_opt $keep_build \
 		$_package \
 		prepare_subpackages \
 		prepare_language_packs \
@@ -1952,8 +1952,9 @@ builddeps() {
 		export ABUILD_VISITED="$ABUILD_VISITED $pkg"
 
 		msg "Entering $dir"
-		cd "$dir" && $0 $forceroot $keep $quiet $install_deps \
-			$recursive $upgrade $color_opt abuildindex || return 1
+		cd "$dir" && $0 $forceroot $keep $keep_build $quiet \
+			$install_deps $recursive $upgrade $color_opt \
+			abuildindex || return 1
 	done
 	$SUDO_APK add --upgrade --repository "$REPODEST/$repo" \
 		$apk_opt_wait \
@@ -2261,7 +2262,7 @@ while getopts "AcdfFhkKimnp:P:qrRs:u" opt; do
 		'F') forceroot="-F";;
 		'h') usage;;
 		'k') keep="-k";;
-		'K') CLEANUP="" ERROR_CLEANUP="" ;;
+		'K') keep_build="-K";;
 		'm') disable_colors
 		     color_opt="-m";;
 		'n') die "Use newapkbuild to create new aports";;
-- 
cgit v1.2.3-60-g2f50