Merged from trunk -r15050:15051

   | 15051   | Remove unused STARTDIR variable.                             |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=15115

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 6063d9e1de696f988ac8a3e5b616592f297c1146..79b81074d5bc568e9150792de7d37e711f24318e 100755 (executable)
--- 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 925c7e203632ab77409a88466ae4acd16148325a..3cad9f977de78b6acdb1436b1df699a2e8081467 100644 (file)
--- 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