Fix _ObjectKey.__eq__() to account for potential hash collisions that would

break dict behavior. Thanks to Lucian Poston for spotting this.

svn path=/main/trunk/; revision=11473

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 598845e0bb9128fc920f62c59ffe2c451e82a45c..2c030c13c73766f8e0b82f528d0cae769fb62dc6 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -169,11 +169,12 @@ class LinkageMap(object):
                        return hash(self._key)
 
                def __eq__(self, other):
-                       if isinstance(other, self.__class__):
-                               other_key = other._key
-                       else:
-                               other_key = other
-                       return self._key == other_key
+                       if not isinstance(other, self.__class__):
+                               # Can't safely return True in this case since
+                               # if there is a hash collision then __eq__ needs
+                               # to be relied upon for correct dict behavior.
+                               return False
+                       return self._key == other._key
 
                def _generate_object_key(self, object):
                        """