From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 27 Feb 2007 21:45:01 +0000 (-0000)
Subject: Merged from branches/prefix r6092:6093.
X-Git-Tag: v2.2_pre1~1641
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a4a7eddef75b20ab7cdeac6c1a444f82e1a0073;p=portage.git

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
---

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: