From c7d55759963ab10685ec142613c30101f5baa999 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 29 Nov 2007 08:28:40 +0000 Subject: 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 --- pym/portage/dbapi/vartree.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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, -- cgit v1.2.3-1-g7c22