diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-04-24 06:37:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-24 06:37:22 +0000 |
| commit | 2a837288be5ec8f50fb0b9859fcc9f993b709e60 (patch) | |
| tree | 3437dbdd6d56603f8558937d63f7d10408719eba | |
| parent | c4381c61135ae8b784c243db3c3f1092c25f8d6a (diff) | |
| download | portage-2a837288be5ec8f50fb0b9859fcc9f993b709e60.tar.gz portage-2a837288be5ec8f50fb0b9859fcc9f993b709e60.tar.bz2 portage-2a837288be5ec8f50fb0b9859fcc9f993b709e60.zip | |
Revert r13390 (dosed and dohard functions) since a stack trace isn't really
important this particular QA feature. Thanks to Tiziano Müller <dev-zero@g.o>
for the suggestion.
svn path=/main/trunk/; revision=13391
| -rwxr-xr-x | bin/ebuild.sh | 8 | ||||
| -rwxr-xr-x | bin/isolated-functions.sh | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 43d428ed7..9cbd748e6 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1444,14 +1444,6 @@ _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 7996268d7..ccef19ed2 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -498,8 +498,7 @@ save_ebuild_env() { done unset x - unset -f die diefunc dosed dohard dump_trace \ - quiet_mode vecho elog_base eqawarn elog \ + unset -f dump_trace die diefunc 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 \ |