From 866a2eaa0e298efafb59d4a8e5bd470af13007f3 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 3 May 2006 23:00:08 +0000
Subject: Improve the error message when an eclass is not found and remove
 unnecesary ERRORMSG variable.

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

(limited to 'bin/ebuild.sh')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index d9f563a0b..7450a1048 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1169,6 +1169,7 @@ inherit() {
 			done
 		fi
 		debug-print "inherit: $1 -> $location"
+		[ ! -e "$location" ] && die "${1}.eclass could not be found by inherit()"
 
 		#We need to back up the value of DEPEND and RDEPEND to B_DEPEND and B_RDEPEND
 		#(if set).. and then restore them after the inherit call.
@@ -1186,8 +1187,7 @@ inherit() {
 		#turn on glob expansion
 		set +f
 
-		source "$location" || export ERRORMSG="died sourcing $location in inherit()"
-		[ -z "${ERRORMSG}" ] || die "${ERRORMSG}"
+		source "$location" || die "died sourcing $location in inherit()"
 
 		#turn off glob expansion
 		set -f
@@ -1435,7 +1435,6 @@ if ! hasq depend $EBUILD_PHASE; then
 	RESTRICT="${PORTAGE_RESTRICT}"
 	unset PORTAGE_RESTRICT
 fi
-[ -z "${ERRORMSG}" ] || die "${ERRORMSG}"
 
 # Expand KEYWORDS
 # We need to turn off pathname expansion for -* in KEYWORDS and
-- 
cgit v1.2.3-1-g7c22