diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-29 08:28:40 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-29 08:28:40 +0000 |
| commit | c7d55759963ab10685ec142613c30101f5baa999 (patch) | |
| tree | 3cba4c0a6632abb8079607a6b86bf2193ceddccf /pym | |
| parent | 8c6ddc77bbacf7dd72efc7b609a3346c16d0cbdf (diff) | |
| download | portage-c7d55759963ab10685ec142613c30101f5baa999.tar.gz portage-c7d55759963ab10685ec142613c30101f5baa999.tar.bz2 portage-c7d55759963ab10685ec142613c30101f5baa999.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 6 |
1 files 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, |