From a0dc3ed1a074d36707fbbdd7214f5cceca6a6881 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 18 Dec 2009 08:26:50 +0000 Subject: [PATCH] Merged from trunk -r15050:15051 | 15051 | Remove unused STARTDIR variable. | | zmedico | | svn path=/main/branches/prefix/; revision=15115 --- bin/isolated-functions.sh | 2 +- 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 6063d9e1d..79b81074d 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -577,7 +577,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 # Prefix additions diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 925c7e203..3cad9f977 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1435,7 +1435,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", "BPREFIX", "DEFAULT_PATH", "PORTAGE_GROUP", "PORTAGE_USER" @@ -6214,7 +6214,6 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m mysettings["EPREFIX"] = EPREFIX.rstrip(os.path.sep) mysettings["ROOT"] = myroot mysettings["EROOT"] = myroot + mysettings["EPREFIX"].lstrip(os.path.sep) + os.path.sep - mysettings["STARTDIR"] = getcwd() mysettings["EBUILD"] = ebuild_path mysettings["O"] = pkg_dir mysettings.configdict["pkg"]["CATEGORY"] = cat -- 2.26.2