[patch] If we have to decide between a non-virtual and one or more virtual packages, choose the non-virtual package without calling ambiguous_package_name.

portage-emerge-prefer-non-virtual-over-virtual.patch (text/plain), 889 bytes, created by Sebastian Luther (few) on 2009-06-10 08:41:20 UTC

Index: pym/_emerge/__init__.py
===================================================================
--- pym/_emerge/__init__.py	(revision 13635)
+++ pym/_emerge/__init__.py	(working copy)
@@ -5639,7 +5639,19 @@
 					expanded_atoms = [atom for atom in expanded_atoms \
 						if portage.dep_getkey(atom) == installed_cp]
 
+				#if a non-virtual package and one or more virtual packages
+				#are in expanded_atoms, use the non-virtual package
 				if len(expanded_atoms) > 1:
+					number_of_virtuals = 0
+					for expanded_atom in expanded_atoms:
+						if expanded_atom.startswith("virtual/"):
+							number_of_virtuals += 1
+						else:
+							candidate = expanded_atom
+					if len(expanded_atoms) - number_of_virtuals == 1:
+						expanded_atoms = [ candidate ]
+
+				if len(expanded_atoms) > 1:
 					print
 					print
 					ambiguous_package_name(x, expanded_atoms, root_config,