From 8a96a196ac083f730bebc18cd342fec588aecfa6 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 2 Nov 2008 07:58:32 +0000 Subject: [PATCH] Apply r11777 to LinkageMapMachO svn path=/main/branches/prefix/; revision=11794 --- pym/portage/dbapi/vartree.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 30bd43679..6827ea053 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -635,7 +635,7 @@ class LinkageMapMachO(object): __slots__ = ("__weakref__", "_key") - def __init__(self, object, root): + def __init__(self, obj, root): """ This takes a path to an object. @@ -643,7 +643,7 @@ class LinkageMapMachO(object): @type object: string (example: '/usr/bin/bar') """ - self._key = self._generate_object_key(object, root) + self._key = self._generate_object_key(obj, root) def __hash__(self): return hash(self._key) @@ -651,7 +651,7 @@ class LinkageMapMachO(object): def __eq__(self, other): return self._key == other._key - def _generate_object_key(self, object, root): + def _generate_object_key(self, obj, root): """ Generate object key for a given object. @@ -665,7 +665,7 @@ class LinkageMapMachO(object): 2. realpath of object if object does not exist. """ - abs_path = os.path.join(root, object.lstrip(os.path.sep)) + abs_path = os.path.join(root, obj.lstrip(os.path.sep)) try: object_stat = os.stat(abs_path) except OSError: -- 2.26.2