[patch] Proposed fix v1

bug409179a.patch (text/plain), 1.19 KB, created by Martin von Gagern on 2012-03-21 14:16:26 UTC

diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/pym/portage/package/ebuild/getmaskingreason.py
index f2af638..395fd90 100644
--- a/pym/portage/package/ebuild/getmaskingreason.py
+++ b/pym/portage/package/ebuild/getmaskingreason.py
@@ -83,7 +83,7 @@ def getmaskingreason(mycpv, metadata=None, settings=None,
 	pmasklists = []
 	for profile in locations:
 		pmask_filename = os.path.join(profile, "package.mask")
-		pmasklists.append((pmask_filename, grablines(pmask_filename, recursive=1)))
+		pmasklists.append(grablines(pmask_filename, recursive=1, remember_source_file=True))
 
 	pmaskdict = settings._mask_manager._pmaskdict
 	if mycp in pmaskdict:
@@ -93,9 +93,13 @@ def getmaskingreason(mycpv, metadata=None, settings=None,
 				for pmask in pmasklists:
 					comment = ""
 					comment_valid = -1
-					pmask_filename = pmask[0]
-					for i in range(len(pmask[1])):
-						l = pmask[1][i].strip()
+					old_filename = ""
+					for i in range(len(pmask)):
+						l, pmask_filename = pmask[i]
+						if pmask_filename != old_filename:
+							comment = ""
+							comment_valid = -1
+						l = l.strip()
 						try:
 							l_atom = Atom(l, allow_repo=True,
 								allow_wildcard=True).without_repo