Merged from trunk 9215:9217

   | 9216    | Replace the current diefunc() and die alias with a single    |
   | zmedico | die() function. The previous arguments to diefunc() weren't  |
   |         | used anyway. The result is that the die message looks better |
   |         | because it doesn't show the alias and all of it's arguments  |
   |         | which are totally irrelevant. (branches/prefix r9212)        |

   | 9217    | We need to implement diefunc() since environment.bz2 files   |
   | zmedico | contain calls to it (due to alias expansion).                |

svn path=/main/branches/prefix/; revision=9219

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index c3f3f2322201963dc48fa61fce1f6e00769c7c12..ca971bfdfdea21fed0a3163a4d8d4026835bf1e7 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -142,6 +142,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 ]]
 }
@@ -448,7 +454,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 diefunc 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 \