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. (trunk r8745)

svn path=/main/branches/2.1.2/; revision=8748

diff --git a/pym/portage.py b/pym/portage.py
index 5d0ea8f8f6bd2c38c84f272a285d56199b72e4d0..82565dcba20efc92b8e3f8aade8cf93b7e040bfb 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -9055,9 +9055,8 @@ class dblink:
                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 \
@@ -9079,7 +9078,6 @@ class dblink:
                                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,