From 65c1a6e0dddf0d99af7adbd41484150d5fc6ef9c Mon Sep 17 00:00:00 2001
From: Dror Levin <spatz@gentoo.org>
Date: Wed, 26 May 2010 23:23:38 +0300
Subject: Make utilities die on failure in EAPI 4, bug 273651

---
 bin/ebuild.sh | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'bin/ebuild.sh')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ee565b1f7..01fa46217 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -779,7 +779,11 @@ into() {
 	else
 		export DESTTREE=$1
 		if [ ! -d "${D}${DESTTREE}" ]; then
-			install -d "${D}${DESTTREE}"
+			if ! install -d "${D}${DESTTREE}"; then
+				ret=$?
+				[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+				return $ret
+			fi
 		fi
 	fi
 }
@@ -790,7 +794,11 @@ insinto() {
 	else
 		export INSDESTTREE=$1
 		if [ ! -d "${D}${INSDESTTREE}" ]; then
-			install -d "${D}${INSDESTTREE}"
+			if ! install -d "${D}${INSDESTTREE}"; then
+				ret=$?
+				[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+				return $ret
+			fi
 		fi
 	fi
 }
@@ -801,7 +809,11 @@ exeinto() {
 	else
 		export _E_EXEDESTTREE_="$1"
 		if [ ! -d "${D}${_E_EXEDESTTREE_}" ]; then
-			install -d "${D}${_E_EXEDESTTREE_}"
+			if ! install -d "${D}${_E_EXEDESTTREE_}"; then
+				ret=$?
+				[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+				return $ret
+			fi
 		fi
 	fi
 }
@@ -812,7 +824,11 @@ docinto() {
 	else
 		export _E_DOCDESTTREE_="$1"
 		if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then
-			install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
+			if ! install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"; then
+				ret=$?
+				[[ $ret -ne 0 ]] && helpers_die "$0 failed"
+				return $ret
+			fi
 		fi
 	fi
 }
-- 
cgit v1.2.3-1-g7c22