drop IMAGE -- people have had years to catch up (trunk r14694)

svn path=/main/branches/2.1.7/; revision=14697

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b94e81df2e154c2c5959bc56d2f4dbeaa0808c82..658ac64af59a63690b754adc731c1181414e9cd8 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -79,10 +79,6 @@ unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE
 
 source "${PORTAGE_BIN_PATH}/isolated-functions.sh"  &>/dev/null
 
-# Set IMAGE for minimal backward compatibility with
-# overlays or user's bashrc, but don't export it.
-[ "${EBUILD_PHASE}" == "preinst" ] && IMAGE=${D}
-
 [[ $PORTAGE_QUIET != "" ]] && export PORTAGE_QUIET
 
 # the sandbox is disabled by default except when overridden in the relevant stages

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 94afc910440c482e7ac8090d7199d5a9c34a3abd..080ace85eb0739f27c7b6c2321023503efdbe812 100755 (executable)
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -547,7 +547,7 @@ save_ebuild_env() {
                        DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \
                        EBUILD_EXIT_STATUS_FILE EBUILD_FORCE_TEST EBUILD_MASTER_PID \
                        ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \
-                       GOOD HILITE HOME IMAGE \
+                       GOOD HILITE HOME \
                        LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
                        NOCOLOR NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
                        PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST \

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 57a894f4069f81ef15f483934748b366cb7a939d..5c2a83460407cbad11d00f1cd41ccca637b456ec 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3974,7 +3974,7 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero
        Optiosn include:
 
        Sandbox: Sandbox means the spawned process will be limited in its ability t
-       read and write files (normally this means it is restricted to ${IMAGE}/)
+       read and write files (normally this means it is restricted to ${D}/)
        SElinux Sandbox: Enables sandboxing on SElinux
        Reduced Privileges: Drops privilages such that the process runs as portage:portage
        instead of as root.