summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-27 21:45:01 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-27 21:45:01 +0000
commit2a4a7eddef75b20ab7cdeac6c1a444f82e1a0073 (patch)
treea9b65fa0b602d46bf08589792d8d8a7959f7e146
parent1edd8893cf52d521bbe31b05e7752c27039a6af1 (diff)
downloadportage-2a4a7eddef75b20ab7cdeac6c1a444f82e1a0073.tar.gz
portage-2a4a7eddef75b20ab7cdeac6c1a444f82e1a0073.tar.bz2
portage-2a4a7eddef75b20ab7cdeac6c1a444f82e1a0073.zip
Merged from branches/prefix r6092:6093.
Avoid "TypeError: unpack non-sequence" backtraces, and return a set of None, None when was asked for the location. svn path=/main/trunk/; revision=6099
-rw-r--r--pym/portage/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 57040b1cb..1b7cf94bf 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -4467,7 +4467,10 @@ def getmaskingreason(mycpv, settings=None, portdb=None, return_location=False):
# Apparently this comment applies to muliple masks, so
# it remains valid until a blank line is encountered.
comment_valid += 1
- return None
+ if return_location:
+ return (None, None)
+ else:
+ return None
def getmaskingstatus(mycpv, settings=None, portdb=None):
if settings is None: