| 1 |
commit: 038f142cffb8437dbb2e8588078e802d441c3860 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 1 02:23:23 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 1 02:23:23 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=038f142c |
| 7 |
|
| 8 |
LinkageMapElf.findConsumers(): fix $ROOT handling |
| 9 |
|
| 10 |
The code which checks the soname symlink was missing a join with |
| 11 |
$ROOT. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 3 ++- |
| 15 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 18 |
index f3a5129..c55d6d6 100644 |
| 19 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 20 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 21 |
@@ -661,9 +661,10 @@ class LinkageMapELF(object): |
| 22 |
soname = self._obj_properties[obj_key][3] |
| 23 |
soname_link = os.path.join(self._root, |
| 24 |
os.path.dirname(obj).lstrip(os.path.sep), soname) |
| 25 |
+ obj_path = os.path.join(self._root, obj.lstrip(os.sep)) |
| 26 |
try: |
| 27 |
soname_st = os.stat(soname_link) |
| 28 |
- obj_st = os.stat(obj) |
| 29 |
+ obj_st = os.stat(obj_path) |
| 30 |
except OSError: |
| 31 |
pass |
| 32 |
else: |
Archives