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 57040b1cb9e3ef93d22d0ecb7b440949a0cc81d2..1b7cf94bf05c18e2fd2a0e2147799bfb64e4d30e 100644 (file)
--- 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: