diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-05-07 21:46:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-05-07 21:46:08 -0700 |
| commit | 36ad74b36d6d70a21d24ef7cb180ab09a6a327f0 (patch) | |
| tree | 6e02ffc8f7046ef040c7a59bb2888ae4dc0cff80 | |
| parent | a81460175a441897282b0540cefff8060f2b92dc (diff) | |
| download | portage-36ad74b36d6d70a21d24ef7cb180ab09a6a327f0.tar.gz portage-36ad74b36d6d70a21d24ef7cb180ab09a6a327f0.tar.bz2 portage-36ad74b36d6d70a21d24ef7cb180ab09a6a327f0.zip | |
Use EROOT with VDB_PATH in recent changes.
| -rw-r--r-- | pym/_emerge/EbuildPhase.py | 4 | ||||
| -rw-r--r-- | pym/portage/util/_dyn_libs/LinkageMapELF.py | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py index e75673c7c..21d7f4720 100644 --- a/pym/_emerge/EbuildPhase.py +++ b/pym/_emerge/EbuildPhase.py @@ -146,8 +146,8 @@ class EbuildPhase(CompositeTask): if (self.phase in self._locked_phases and "ebuild-locks" in self.settings.features): - root = self.settings["ROOT"] - lock_path = os.path.join(root, portage.VDB_PATH + "-ebuild") + eroot = self.settings["EROOT"] + lock_path = os.path.join(eroot, portage.VDB_PATH + "-ebuild") if os.access(os.path.dirname(lock_path), os.W_OK): self._ebuild_lock = lockdir(lock_path) self._start_task(ebuild_process, self._ebuild_exit) diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py index ce77bb442..31aacbbf2 100644 --- a/pym/portage/util/_dyn_libs/LinkageMapELF.py +++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py @@ -183,8 +183,7 @@ class LinkageMapELF(object): lines.append((include_file, line)) aux_keys = [self._needed_aux_key] - vdb_path = os.path.join(self._root, portage.VDB_PATH) - vdb_lock = lockdir(vdb_path) + self._dbapi.lock() try: for cpv in self._dbapi.cpv_all(): if exclude_pkgs is not None and cpv in exclude_pkgs: @@ -194,7 +193,7 @@ class LinkageMapELF(object): for line in self._dbapi.aux_get(cpv, aux_keys)[0].splitlines(): lines.append((needed_file, line)) finally: - unlockdir(vdb_lock) + self._dbapi.unlock() # have to call scanelf for preserved libs here as they aren't # registered in NEEDED.ELF.2 files |