Attachment #872660 for bug #850745

View | Details | Raw Unified | Return to bug 850745
Collapse All | Expand All




    if mycp in pmaskdict:
        for x in pmaskdict[mycp]:
            if match_from_list(x, cpv_slot_list):
                x = x.without_repo
                for pmask in pmasklists:
                    comment = ""
                    comment_valid = -1

                        try:
                            l_atom = Atom(
                                l, allow_repo=True, allow_wildcard=True
                            )
                        except InvalidAtom:
                            l_atom = None
                        if l == "":

                        elif l_atom == x:
                            if comment_valid != i:
                                comment = ""
                            if mycp not in l_atom:
                                comment +="# masked by wildcard: " + l_atom + "\n"
                            if return_location:
                                return (comment, pmask_filename)
                            return comment

Return to bug 850745

Lines 92-98 Link Here

(-)package/ebuild/getmaskingreason.py.orig (-2 / +3 lines)
92	if mycp in pmaskdict:	92	if mycp in pmaskdict:
93	for x in pmaskdict[mycp]:	93	for x in pmaskdict[mycp]:
94	if match_from_list(x, cpv_slot_list):	94	if match_from_list(x, cpv_slot_list):
95	x = x.without_repo
96	for pmask in pmasklists:	95	for pmask in pmasklists:
97	comment = ""	96	comment = ""
98	comment_valid = -1	97	comment_valid = -1
Lines 102-108 Link Here
102	try:	101	try:
103	l_atom = Atom(	102	l_atom = Atom(
104	l, allow_repo=True, allow_wildcard=True	103	l, allow_repo=True, allow_wildcard=True
105	).without_repo	104	)
106	except InvalidAtom:	105	except InvalidAtom:
107	l_atom = None	106	l_atom = None
108	if l == "":	107	if l == "":
Lines 114-119 Link Here
114	elif l_atom == x:	113	elif l_atom == x:
115	if comment_valid != i:	114	if comment_valid != i:
116	comment = ""	115	comment = ""
		116	if mycp not in l_atom:
		117	comment +="# masked by wildcard: " + l_atom + "\n"
117	if return_location:	118	if return_location:
118	return (comment, pmask_filename)	119	return (comment, pmask_filename)
119	return comment	120	return comment