From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Date: Wed, 17 Oct 2012 22:41:38 +0000 (+0200)
Subject: Make keepdir() compatible with subslots.
X-Git-Tag: v2.2.0_alpha141~26
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e72d8353f7a9493e0508c367e416423b52ea22ce;p=portage.git

Make keepdir() compatible with subslots.
---

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 67d09a462..5055060f7 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -150,7 +150,7 @@ keepdir() {
 	fi
 	if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then
 		shift
-		find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \
+		find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT%/*}\n" \
 			| tr "\n" "\0" | \
 			while read -r -d $'\0' ; do
 				>> "$REPLY" || \
@@ -158,7 +158,7 @@ keepdir() {
 			done
 	else
 		for x in "$@"; do
-			>> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \
+			>> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT%/*}" || \
 				die "Failed to create .keep in ${ED}${x}"
 		done
 	fi