summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-30 19:19:14 -0700
committerZac Medico <zmedico@gentoo.org>2011-06-30 19:19:14 -0700
commit8e5ff9b6d508eecc7d46eaddc674111c1ba45c42 (patch)
tree8ff51abbad778a54f61e4aa0d716005f5b2e0782
parent4951d8d694433995b382088cb36af7aa800719b7 (diff)
downloadportage-8e5ff9b6d508eecc7d46eaddc674111c1ba45c42.tar.gz
portage-8e5ff9b6d508eecc7d46eaddc674111c1ba45c42.tar.bz2
portage-8e5ff9b6d508eecc7d46eaddc674111c1ba45c42.zip
LinkageMapElf: clarify findConsumers soname code
Here it referred to an soname symlink as a "master" link, which was inconsistent with the meaning of "master" link used in the isMasterLink() method.
-rw-r--r--pym/portage/util/_dyn_libs/LinkageMapELF.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py
index c56caae18..f3a5129b0 100644
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -654,21 +654,21 @@ class LinkageMapELF(object):
raise KeyError("%s (%s) not in object list" % (obj_key, obj))
# If there is another version of this lib with the
- # same soname and the master link points to that
+ # same soname and the soname symlink points to that
# other version, this lib will be shadowed and won't
# have any consumers.
if not isinstance(obj, self._ObjectKey):
soname = self._obj_properties[obj_key][3]
- master_link = os.path.join(self._root,
+ soname_link = os.path.join(self._root,
os.path.dirname(obj).lstrip(os.path.sep), soname)
try:
- master_st = os.stat(master_link)
+ soname_st = os.stat(soname_link)
obj_st = os.stat(obj)
except OSError:
pass
else:
if (obj_st.st_dev, obj_st.st_ino) != \
- (master_st.st_dev, master_st.st_ino):
+ (soname_st.st_dev, soname_st.st_ino):
return set()
# Determine the directory(ies) from the set of objects.