Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 409179
Collapse All | Expand All

(-)a/pym/portage/package/ebuild/getmaskingreason.py (-4 / +8 lines)
Lines 83-89 def getmaskingreason(mycpv, metadata=None, settings=None, Link Here
83
	pmasklists = []
83
	pmasklists = []
84
	for profile in locations:
84
	for profile in locations:
85
		pmask_filename = os.path.join(profile, "package.mask")
85
		pmask_filename = os.path.join(profile, "package.mask")
86
		pmasklists.append((pmask_filename, grablines(pmask_filename, recursive=1)))
86
		pmasklists.append(grablines(pmask_filename, recursive=1, remember_source_file=True))
87
87
88
	pmaskdict = settings._mask_manager._pmaskdict
88
	pmaskdict = settings._mask_manager._pmaskdict
89
	if mycp in pmaskdict:
89
	if mycp in pmaskdict:
Lines 93-101 def getmaskingreason(mycpv, metadata=None, settings=None, Link Here
93
				for pmask in pmasklists:
93
				for pmask in pmasklists:
94
					comment = ""
94
					comment = ""
95
					comment_valid = -1
95
					comment_valid = -1
96
					pmask_filename = pmask[0]
96
					old_filename = ""
97
					for i in range(len(pmask[1])):
97
					for i in range(len(pmask)):
98
						l = pmask[1][i].strip()
98
						l, pmask_filename = pmask[i]
99
						if pmask_filename != old_filename:
100
							comment = ""
101
							comment_valid = -1
102
						l = l.strip()
99
						try:
103
						try:
100
							l_atom = Atom(l, allow_repo=True,
104
							l_atom = Atom(l, allow_repo=True,
101
								allow_wildcard=True).without_repo
105
								allow_wildcard=True).without_repo

Return to bug 409179