summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-30 00:38:22 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-30 00:38:22 +0000
commit564b75e5ae9f5e406f039c0aa91b00d4d885235c (patch)
treec3d4f6bd68b4fc8fbc652edeab0ccb17d004037a /pym
parentc32bbd2e8b207b4a35af70983b170081feabc8df (diff)
downloadportage-564b75e5ae9f5e406f039c0aa91b00d4d885235c.tar.gz
portage-564b75e5ae9f5e406f039c0aa91b00d4d885235c.tar.bz2
portage-564b75e5ae9f5e406f039c0aa91b00d4d885235c.zip
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
Diffstat (limited to 'pym')
-rw-r--r--pym/portage_dep.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index dea19063b..0d38cf516 100644
--- 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: