[gentoo-commits] proj/portage:multilib commit in: bin/

["Thomas Sachau" <tommy@gentoo.org>]

commit:     bc55fa6c10f027ba1eb986d3fc6698cd009eff54
Author:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 12:32:19 2018 +0000
Commit:     Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 12:32:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bc55fa6c

Remove remaining else case

 bin/phase-functions.sh | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 6c8da017d..65ad0610b 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -806,20 +806,18 @@ __dyn_install() {
 		>> DEBUGBUILD
 	fi
 
-	else
-		if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
-			cd "${PORTAGE_BUILDDIR}"
-			if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
-				rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
-					"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
-					"$PORTAGE_BUILDDIR"/.die_hooks
+	if [[ " ${FEATURES} " == *" force-multilib "* ]]; then
+		cd "${PORTAGE_BUILDDIR}"
+		if [[ $EMERGE_FROM = binary ]] || ! has keepwork $FEATURES; then
+			rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
+				"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
+				"$PORTAGE_BUILDDIR"/.die_hooks
 
-				rm -rf "${WORKDIR}"
-			fi
+			rm -rf "${WORKDIR}"
+		fi
 
-			if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
-				find "${PORTAGE_BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
-			fi
+		if [ -f "${PORTAGE_BUILDDIR}/.unpacked" ]; then
+			find "${PORTAGE_BUILDDIR}" -type d ! -regex "^${WORKDIR}" | sort -r | tr "\n" "\0" | $XARGS -0 rmdir &>/dev/null
 		fi
 	fi
 	trap - SIGINT SIGQUIT