diff options
author | Alec Warner <antarus@gentoo.org> | 2007-02-07 20:33:45 +0000 |
---|---|---|
committer | Alec Warner <antarus@gentoo.org> | 2007-02-07 20:33:45 +0000 |
commit | 038146623c0cdca0ba2038ee7837c3a2170b35de (patch) | |
tree | b0165a810639685ae5bf3f08aa3d07ece7115199 /bin/ebuild.sh | |
parent | 411d007523f9508170ec6fb4ec070a1abb689ae1 (diff) | |
download | portage-038146623c0cdca0ba2038ee7837c3a2170b35de.tar.gz portage-038146623c0cdca0ba2038ee7837c3a2170b35de.tar.bz2 portage-038146623c0cdca0ba2038ee7837c3a2170b35de.zip |
move die into isolated-functions.sh
svn path=/main/trunk/; revision=5910
Diffstat (limited to 'bin/ebuild.sh')
-rwxr-xr-x | bin/ebuild.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index d943a64a1..db8193ae2 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -64,22 +64,14 @@ unalias -a # Unset some variables that break things. unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE -# We need this next line for "die" and "assert". It expands -# It _must_ preceed all the calls to die and assert. -shopt -s expand_aliases -alias die='diefunc "$FUNCNAME" "$LINENO" "$?"' -alias assert='_pipestatus="${PIPESTATUS[*]}"; [[ "${_pipestatus// /}" -eq 0 ]] || diefunc "$FUNCNAME" "$LINENO" "$_pipestatus"' -alias save_IFS='[ "${IFS:-unset}" != "unset" ] && old_IFS="${IFS}"' -alias restore_IFS='if [ "${old_IFS:-unset}" != "unset" ]; then IFS="${old_IFS}"; unset old_IFS; else unset IFS; fi' - -OCC="$CC" -OCXX="$CXX" - export PATH="/usr/local/sbin:/sbin:/usr/sbin:${PORTAGE_BIN_PATH}:/usr/local/bin:/bin:/usr/bin:${ROOTPATH}" [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH" source "${PORTAGE_BIN_PATH}/isolated-functions.sh" &>/dev/null +OCC="$CC" +OCXX="$CXX" + [[ $PORTAGE_QUIET != "" ]] && export PORTAGE_QUIET # the sandbox is disabled by default except when overridden in the relevant stages |