[patch] solve circular deps if there's a suitable jdk installed already

circular.patch (text/plain), 1.23 KB, created by Zac Medico on 2008-09-01 18:57:55 UTC

Index: pym/portage/__init__.py
===================================================================
--- pym/portage/__init__.py	(revision 11477)
+++ pym/portage/__init__.py	(revision 11478)
@@ -6218,6 +6218,7 @@
 	# d) is the first item
 
 	preferred = []
+	preferred_not_installed = []
 	preferred_any_slot = []
 	possible_upgrades = []
 	other = []
@@ -6298,7 +6299,7 @@
 						break
 				if all_in_graph:
 					if parent is None:
-						preferred.append(this_choice)
+						preferred_not_installed.append(this_choice)
 					else:
 						# Check if the atom would result in a direct circular
 						# dependency and try to avoid that if it seems likely
@@ -6318,7 +6319,7 @@
 								circular_atom = atom
 								break
 						if circular_atom is None:
-							preferred.append(this_choice)
+							preferred_not_installed.append(this_choice)
 						else:
 							other.append(this_choice)
 				else:
@@ -6332,6 +6333,7 @@
 	# into || ( highest version ... lowest version ).  We want to prefer the
 	# highest all_available version of the new-style virtual when there is a
 	# lower all_installed version.
+	preferred.extend(preferred_not_installed)
 	preferred.extend(preferred_any_slot)
 	preferred.extend(possible_upgrades)
 	possible_upgrades = preferred[1:]