Attachment #258608 for bug #350285




		matches = vardb.match_pkgs(atom)
		if not matches:
			return None, None
		if len(matches) > 1:
			unmasked = [pkg for pkg in matches if \
				self._pkg_visibility_check(pkg)]
			if unmasked:
				if len(unmasked) == 1:
					matches = unmasked
				else:
					# Account for packages with masks (like KEYWORDS masks)
					# that are usually ignored in visibility checks for
					# installed packages, in order to handle cases like
					# bug #350285.
					unmasked = [pkg for pkg in matches if not pkg.masks]
					if unmasked:
						matches = unmasked
		pkg = matches[-1] # highest match
		in_graph = self._dynamic_config._slot_pkg_map[root].get(pkg.slot_atom)
		return pkg, in_graph
- 

Return to bug 350285

Lines 3240-3245 class depgraph(object): Link Here

(-)a/pym/_emerge/depgraph.py (-1 / +14 lines)
3240	matches = vardb.match_pkgs(atom)	3240	matches = vardb.match_pkgs(atom)
3241	if not matches:	3241	if not matches:
3242	return None, None	3242	return None, None
		3243	if len(matches) > 1:
		3244	unmasked = [pkg for pkg in matches if \
		3245	self._pkg_visibility_check(pkg)]
		3246	if unmasked:
		3247	if len(unmasked) == 1:
		3248	matches = unmasked
		3249	else:
		3250	# Account for packages with masks (like KEYWORDS masks)
		3251	# that are usually ignored in visibility checks for
		3252	# installed packages, in order to handle cases like
		3253	# bug #350285.
		3254	unmasked = [pkg for pkg in matches if not pkg.masks]
		3255	if unmasked:
		3256	matches = unmasked
3243	pkg = matches[-1] # highest match	3257	pkg = matches[-1] # highest match
3244	in_graph = self._dynamic_config._slot_pkg_map[root].get(pkg.slot_atom)	3258	in_graph = self._dynamic_config._slot_pkg_map[root].get(pkg.slot_atom)
3245	return pkg, in_graph	3259	return pkg, in_graph
3246	-