From 2bafee5c926a644e58099bb5dbb3eec7cd80518c Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 13 Sep 2012 21:56:10 -0700 Subject: Drop diefunc protection. The last usage of it was added 67e88b82726a93eda^, 01/20/08; 4.5 years later, the compatibility measure is no longer needed. --- bin/isolated-functions.sh | 6 ------ bin/save-ebuild-env.sh | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index d33c0b61e..37e5f2de0 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -245,12 +245,6 @@ die() { exit 1 } -# We need to implement diefunc() since environment.bz2 files contain -# calls to it (due to alias expansion). -diefunc() { - die "${@}" -} - quiet_mode() { [[ ${PORTAGE_QUIET} -eq 1 ]] } diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index d8883cbdb..37438a5d9 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -47,7 +47,7 @@ save_ebuild_env() { unset x unset -f assert assert_sigpipe_ok \ - dump_trace die diefunc \ + dump_trace die \ 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 \ -- cgit v1.2.3-1-g7c22