diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-10-19 07:38:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-10-19 07:38:44 +0000 |
| commit | 486c66235de2a25dcd29d1f6d671f3795ff8949d (patch) | |
| tree | 13e8e8353fc557efd14acca5f82936313a5ff761 | |
| parent | c3932e58235cc38c5dfeb51f58e6342f3b3a7d6e (diff) | |
| download | portage-486c66235de2a25dcd29d1f6d671f3795ff8949d.tar.gz portage-486c66235de2a25dcd29d1f6d671f3795ff8949d.tar.bz2 portage-486c66235de2a25dcd29d1f6d671f3795ff8949d.zip | |
drop IMAGE -- people have had years to catch up
svn path=/main/trunk/; revision=14694
| -rwxr-xr-x | bin/ebuild.sh | 4 | ||||
| -rwxr-xr-x | bin/isolated-functions.sh | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 4ffff2b6d..bf8844f5f 100755 --- 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 94afc9104..080ace85e 100755 --- 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 521cb53c4..82fb80edd 100644 --- 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. |