For bug #151326, prevent invalid comments from being returned by portage.getmaskingre...

svn path=/main/trunk/; revision=5428

diff --git a/pym/portage.py b/pym/portage.py
index 735920cf71f4a359ff14f55859ddb7e4d1692ff9..18e8ef51b02f13451b6e65ddccb4240e1965826f 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -4328,16 +4328,23 @@ def getmaskingreason(mycpv, settings=None, portdb=None):
                        if mycpv in portdb.xmatch("match-all", x):
                                comment = ""
                                l = "\n"
-                               i = 0
-                               while i < len(pmasklines):
+                               comment_valid = -1
+                               for i in xrange(len(pmasklines)):
                                        l = pmasklines[i].strip()
                                        if l == "":
                                                comment = ""
+                                               comment_valid = -1
                                        elif l[0] == "#":
                                                comment += (l+"\n")
+                                               comment_valid = i + 1
                                        elif l == x:
+                                               if comment_valid != i:
+                                                       comment = ""
                                                return comment
-                                       i = i + 1
+                                       elif comment_valid != -1:
+                                               # Apparently this comment applies to muliple masks, so
+                                               # it remains valid until a blank line is encountered.
+                                               comment_valid += 1
        return None
 
 def getmaskingstatus(mycpv, settings=None, portdb=None):