| 1 |
commit: 36ad74b36d6d70a21d24ef7cb180ab09a6a327f0 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 8 04:46:08 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 8 04:46:08 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=36ad74b3 |
| 7 |
|
| 8 |
Use EROOT with VDB_PATH in recent changes. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/EbuildPhase.py | 4 ++-- |
| 12 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 5 ++--- |
| 13 |
2 files changed, 4 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py |
| 16 |
index e75673c..21d7f47 100644 |
| 17 |
--- a/pym/_emerge/EbuildPhase.py |
| 18 |
+++ b/pym/_emerge/EbuildPhase.py |
| 19 |
@@ -146,8 +146,8 @@ class EbuildPhase(CompositeTask): |
| 20 |
|
| 21 |
if (self.phase in self._locked_phases and |
| 22 |
"ebuild-locks" in self.settings.features): |
| 23 |
- root = self.settings["ROOT"] |
| 24 |
- lock_path = os.path.join(root, portage.VDB_PATH + "-ebuild") |
| 25 |
+ eroot = self.settings["EROOT"] |
| 26 |
+ lock_path = os.path.join(eroot, portage.VDB_PATH + "-ebuild") |
| 27 |
if os.access(os.path.dirname(lock_path), os.W_OK): |
| 28 |
self._ebuild_lock = lockdir(lock_path) |
| 29 |
self._start_task(ebuild_process, self._ebuild_exit) |
| 30 |
|
| 31 |
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 32 |
index ce77bb4..31aacbb 100644 |
| 33 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 34 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 35 |
@@ -183,8 +183,7 @@ class LinkageMapELF(object): |
| 36 |
lines.append((include_file, line)) |
| 37 |
|
| 38 |
aux_keys = [self._needed_aux_key] |
| 39 |
- vdb_path = os.path.join(self._root, portage.VDB_PATH) |
| 40 |
- vdb_lock = lockdir(vdb_path) |
| 41 |
+ self._dbapi.lock() |
| 42 |
try: |
| 43 |
for cpv in self._dbapi.cpv_all(): |
| 44 |
if exclude_pkgs is not None and cpv in exclude_pkgs: |
| 45 |
@@ -194,7 +193,7 @@ class LinkageMapELF(object): |
| 46 |
for line in self._dbapi.aux_get(cpv, aux_keys)[0].splitlines(): |
| 47 |
lines.append((needed_file, line)) |
| 48 |
finally: |
| 49 |
- unlockdir(vdb_lock) |
| 50 |
+ self._dbapi.unlock() |
| 51 |
|
| 52 |
# have to call scanelf for preserved libs here as they aren't |
| 53 |
# registered in NEEDED.ELF.2 files |
Archives