1 |
commit: 8e5ff9b6d508eecc7d46eaddc674111c1ba45c42 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 1 02:19:14 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 1 02:19:14 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8e5ff9b6 |
7 |
|
8 |
LinkageMapElf: clarify findConsumers soname code |
9 |
|
10 |
Here it referred to an soname symlink as a "master" link, which was |
11 |
inconsistent with the meaning of "master" link used in the |
12 |
isMasterLink() method. |
13 |
|
14 |
--- |
15 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 8 ++++---- |
16 |
1 files changed, 4 insertions(+), 4 deletions(-) |
17 |
|
18 |
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
19 |
index c56caae..f3a5129 100644 |
20 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
21 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
22 |
@@ -654,21 +654,21 @@ class LinkageMapELF(object): |
23 |
raise KeyError("%s (%s) not in object list" % (obj_key, obj)) |
24 |
|
25 |
# If there is another version of this lib with the |
26 |
- # same soname and the master link points to that |
27 |
+ # same soname and the soname symlink points to that |
28 |
# other version, this lib will be shadowed and won't |
29 |
# have any consumers. |
30 |
if not isinstance(obj, self._ObjectKey): |
31 |
soname = self._obj_properties[obj_key][3] |
32 |
- master_link = os.path.join(self._root, |
33 |
+ soname_link = os.path.join(self._root, |
34 |
os.path.dirname(obj).lstrip(os.path.sep), soname) |
35 |
try: |
36 |
- master_st = os.stat(master_link) |
37 |
+ soname_st = os.stat(soname_link) |
38 |
obj_st = os.stat(obj) |
39 |
except OSError: |
40 |
pass |
41 |
else: |
42 |
if (obj_st.st_dev, obj_st.st_ino) != \ |
43 |
- (master_st.st_dev, master_st.st_ino): |
44 |
+ (soname_st.st_dev, soname_st.st_ino): |
45 |
return set() |
46 |
|
47 |
# Determine the directory(ies) from the set of objects. |