summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/isolated-functions.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 0a4934901..7e7e710e0 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -136,6 +136,12 @@ 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 ]]
}
@@ -434,7 +440,7 @@ save_ebuild_env() {
# There's no need to bloat environment.bz2 with internally defined
# functions and variables, so filter them out if possible.
- unset -f dump_trace die 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 \
hasv hasq qa_source qa_call addread addwrite adddeny addpredict \