From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 29 Nov 2007 08:28:40 +0000 (-0000)
Subject: Don't modify sys.path inside dblink.merge() because it doesn't seem
X-Git-Tag: v2.2_pre1~275
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c7d55759963ab10685ec142613c30101f5baa999;p=portage.git

Don't modify sys.path inside dblink.merge() because it doesn't seem
to help and it triggers import errors for elog modules when downgrading
to versions of portage that use the old namespace.

svn path=/main/trunk/; revision=8747
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index c64c236e0..12ecb3171 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2354,9 +2354,8 @@ class dblink(object):
 		If portage is reinstalling itself, create temporary
 		copies of PORTAGE_BIN_PATH and PORTAGE_PYM_PATH in order
 		to avoid relying on the new versions which may be
-		incompatible. Insert the temporary PORTAGE_PYM_PATH
-		as the first element of sys.path and register an atexit
-		hook to clean up the temporary directories.
+		incompatible. Register an atexit hook to clean up the
+		temporary directories.
 		"""
 		if self.myroot == "/" and \
 			"sys-apps" == self.cat and \
@@ -2378,7 +2377,6 @@ class dblink(object):
 				shutil.copytree(var_orig, var_new, symlinks=True)
 				os.chmod(var_new, dir_perms)
 			os.chmod(base_path_tmp, dir_perms)
-			sys.path.insert(0, settings["PORTAGE_PYM_PATH"])
 
 		return self._merge(mergeroot, inforoot,
 				myroot, myebuild=myebuild, cleanup=cleanup,