From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 24 Apr 2009 02:29:44 +0000 (-0000)
Subject: Add dummy dosed and dohard functions for EAPI 3, so that a trace can be
X-Git-Tag: v2.2_rc32~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4381c61135ae8b784c243db3c3f1092c25f8d6a;p=portage.git

Add dummy dosed and dohard functions for EAPI 3, so that a trace can be
displayed (not possible with the helper binaries).

svn path=/main/trunk/; revision=13390
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9cbd748e6..43d428ed7 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1444,6 +1444,14 @@ _ebuild_phase_funcs() {
 			eval "$x() { _eapi0_$x \"\$@\" ; }"
 	done
 
+	if ! hasq $eapi 0 1 2 ; then
+		for x in dosed dohard ; do
+			eval "$x() {
+				die \"$x has been banned for EAPI '$eapi'\"
+			}"
+		done
+	fi
+
 	case $eapi in
 
 		0|1)
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index ccef19ed2..7996268d7 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -498,7 +498,8 @@ save_ebuild_env() {
 		done
 		unset x
 
-		unset -f dump_trace die diefunc quiet_mode vecho elog_base eqawarn elog \
+		unset -f die diefunc dosed dohard dump_trace \
+			quiet_mode vecho elog_base eqawarn elog \
 			esyslog einfo einfon ewarn eerror ebegin _eend eend KV_major \
 			KV_minor KV_micro KV_to_int get_KV unset_colors set_colors has \
 			hasg hasgq hasv hasq qa_source qa_call \