summaryrefslogtreecommitdiffstats
path: root/pym/portage
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-21 18:32:08 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-21 18:32:08 -0700
commitb1ff977673d720aa173bc64daa49dfef957fb4ee (patch)
treefbc640b835eea1f947e3e856c1e5380cff7776e7 /pym/portage
parent72298bcb48e432011d56143525adb642bd18f1d4 (diff)
downloadportage-b1ff977673d720aa173bc64daa49dfef957fb4ee.tar.gz
portage-b1ff977673d720aa173bc64daa49dfef957fb4ee.tar.bz2
portage-b1ff977673d720aa173bc64daa49dfef957fb4ee.zip
lock-helper.py: use PORTAGE_PYM_PATH for safety
Diffstat (limited to 'pym/portage')
-rw-r--r--pym/portage/__init__.py1
-rw-r--r--pym/portage/dbapi/vartree.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 2dedde49b..1e6f21b22 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -328,6 +328,7 @@ except (ImportError, OSError) as e:
_python_interpreter = os.path.realpath(sys.executable)
_bin_path = PORTAGE_BIN_PATH
+_pym_path = PORTAGE_PYM_PATH
def _ensure_default_encoding():
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 18a3c0d7c..571b344f3 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3829,6 +3829,7 @@ class dblink(object):
shutil.copytree(var_orig, var_new, symlinks=True)
os.chmod(var_new, dir_perms)
portage._bin_path = settings['PORTAGE_BIN_PATH']
+ portage._pym_path = settings['PORTAGE_PYM_PATH']
os.chmod(base_path_tmp, dir_perms)
# This serves so pre-load the modules.
_preload_elog_modules(self.settings)