diff options
| -rwxr-xr-x | bin/isolated-functions.sh | 2 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 61120705f..294324889 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -569,7 +569,7 @@ save_ebuild_env() { PROFILE_PATHS PWORKDIR QA_INTERCEPTORS \ RC_DEFAULT_INDENT RC_DOT_PATTERN RC_ENDCOL \ RC_INDENTATION READONLY_EBUILD_METADATA READONLY_PORTAGE_VARS \ - ROOT ROOTPATH RPMDIR STARTDIR TEMP TMP TMPDIR USE_EXPAND \ + ROOT ROOTPATH RPMDIR TEMP TMP TMPDIR USE_EXPAND \ WARN XARGS _RC_GET_KV_CACHE # user config variables diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index e4ff736c5..617ca7b00 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1418,7 +1418,7 @@ class config(object): "PORTAGE_TMPDIR", "PORTAGE_UPDATE_ENV", "PORTAGE_VERBOSE", "PORTAGE_WORKDIR_MODE", "PORTDIR", "PORTDIR_OVERLAY", "PREROOTPATH", "PROFILE_PATHS", - "ROOT", "ROOTPATH", "STARTDIR", "T", "TMP", "TMPDIR", + "ROOT", "ROOTPATH", "T", "TMP", "TMPDIR", "USE_EXPAND", "USE_ORDER", "WORKDIR", "XARGS", ] @@ -6200,7 +6200,6 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m mysettings["EROOT"] = myroot mysettings["ROOT"] = myroot - mysettings["STARTDIR"] = getcwd() mysettings["EBUILD"] = ebuild_path mysettings["O"] = pkg_dir mysettings.configdict["pkg"]["CATEGORY"] = cat |