Fix Atom attribute handling in get_operator() and dep_getslot() to account

for None return values. (trunk r10497)

svn path=/main/branches/2.1.2/; revision=10498

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index dea19063bd18f6d24451c228b380c00f4d5fef5f..0d38cf516c277c524113f577500528f9151358fc 100644 (file)
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -310,8 +310,8 @@ def get_operator(mydep):
        @return: The operator. One of:
                '~', '=', '>', '<', '=*', '>=', or '<='
        """
-       operator = getattr(mydep, "operator", None)
-       if operator is not None:
+       operator = getattr(mydep, "operator", False)
+       if operator is not False:
                return operator
        if mydep:
                mydep = remove_slot(mydep)
@@ -385,8 +385,8 @@ def dep_getslot(mydep):
        @rtype: String
        @return: The slot
        """
-       slot = getattr(mydep, "slot", None)
-       if slot is not None:
+       slot = getattr(mydep, "slot", False)
+       if slot is not False:
                return slot
        colon = mydep.find(":")
        if colon != -1: