diff options
| -rwxr-xr-x | bin/ebuild.sh | 4 | ||||
| -rw-r--r-- | pym/portage.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 3f2610c4e..c4cf610f1 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -11,6 +11,8 @@ if [ ! -z "${PORTAGE_GPG_DIR}" ]; then SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_GPG_DIR}" fi +declare -rx EBUILD_PHASE + if [ "$*" != "depend" ] && [ "$*" != "clean" ] && [ "$*" != "nofetch" ]; then if [ -f "${T}/environment" ]; then source "${T}/environment" &>/dev/null @@ -21,8 +23,6 @@ if [ -n "$#" ]; then ARGS="${*}" fi -declare -rx EBUILD_PHASE="$*" - # Prevent aliases from causing portage to act inappropriately. # Make sure it's before everything so we don't mess aliases that follow. unalias -a diff --git a/pym/portage.py b/pym/portage.py index a3cb17079..8ca53b742 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2197,7 +2197,9 @@ def spawnebuild(mydo,actionmap,mysettings,debug,alwaysdep=0,logfile=None): if retval: return retval kwargs = actionmap[mydo]["args"] + mysettings["EBUILD_PHASE"] = mydo phase_retval = spawn(actionmap[mydo]["cmd"] % mydo, mysettings, debug=debug, logfile=logfile, **kwargs) + del mysettings["EBUILD_PHASE"] if phase_retval == os.EX_OK: if mydo == "install": mycommand = " ".join([MISC_SH_BINARY, "install_qa_check"]) |