From 4c25611c9dd21be7a81d32568e10159600659df6 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 26 Nov 2008 20:20:02 +0000
Subject: Bug #205044 - When creating $EBUILD_EXIT_STATUS_FILE, don't direct
 output to /dev/null since it should never fail and if it does then the error
 message might be useful.

svn path=/main/trunk/; revision=12105
---
 bin/ebuild.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f01fdb16c..72f1f5acf 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -275,9 +275,13 @@ register_die_hook() {
 # Ensure that $PWD is sane whenever possible, to protect against
 # exploitation of insecure search path for python -c in ebuilds.
 # See bug #239560.
-if ! hasq "$EBUILD_PHASE" clean depend help ; then
+if ! hasq "$EBUILD_PHASE" clean cleanrm depend help ; then
 	cd "$PORTAGE_BUILDDIR" || \
 		die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'"
+else
+	# Don't try to create this when it's parent
+	# directory doesn't necessarily exist.
+	unset EBUILD_EXIT_STATUS_FILE
 fi
 
 #if no perms are specified, dirs/files will have decent defaults
@@ -2072,8 +2076,10 @@ ebuild_main() {
 		exit 1
 		;;
 	esac
-	[ -n "${EBUILD_EXIT_STATUS_FILE}" ] && \
-		touch "${EBUILD_EXIT_STATUS_FILE}" &>/dev/null
+	if [ -n "$EBUILD_EXIT_STATUS_FILE" ] ; then
+		> "$EBUILD_EXIT_STATUS_FILE" || \
+			die "failed to create '$EBUILD_EXIT_STATUS_FILE'"
+	fi
 }
 
 [[ -n $EBUILD_SH_ARGS ]] && ebuild_main
-- 
cgit v1.2.3-1-g7c22