From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 30 Dec 2006 20:06:33 +0000 (-0000)
Subject: For bug #151326, prevent invalid comments from being returned by portage.getmaskingre... 
X-Git-Tag: v2.1.2~186
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ecf60ce769f6b482d6312142ea1f91c2573c4425;p=portage.git

For bug #151326, prevent invalid comments from being returned by portage.getmaskingreason().

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

diff --git a/pym/portage.py b/pym/portage.py
index 735920cf7..18e8ef51b 100644
--- 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):