Attachment #164281 for bug #230359

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




	# d) is the first item

	preferred = []
	preferred_not_installed = []
	preferred_any_slot = []
	possible_upgrades = []
	other = []

						break
				if all_in_graph:
					if parent is None:
						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

								circular_atom = atom
								break
						if circular_atom is None:
							preferred_not_installed.append(this_choice)
						else:
							other.append(this_choice)
				else:

	# 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:]

Return to bug 230359

Lines 6218-6223 Link Here

(-)pym/portage/__init__.py (-2 / +4 lines)
6218	# d) is the first item	6218	# d) is the first item
6219		6219
6220	preferred = []	6220	preferred = []
		6221	preferred_not_installed = []
6221	preferred_any_slot = []	6222	preferred_any_slot = []
6222	possible_upgrades = []	6223	possible_upgrades = []
6223	other = []	6224	other = []
Lines 6298-6304 Link Here
6298	break	6299	break
6299	if all_in_graph:	6300	if all_in_graph:
6300	if parent is None:	6301	if parent is None:
6301	preferred.append(this_choice)	6302	preferred_not_installed.append(this_choice)
6302	else:	6303	else:
6303	# Check if the atom would result in a direct circular	6304	# Check if the atom would result in a direct circular
6304	# dependency and try to avoid that if it seems likely	6305	# dependency and try to avoid that if it seems likely
Lines 6318-6324 Link Here
6318	circular_atom = atom	6319	circular_atom = atom
6319	break	6320	break
6320	if circular_atom is None:	6321	if circular_atom is None:
6321	preferred.append(this_choice)	6322	preferred_not_installed.append(this_choice)
6322	else:	6323	else:
6323	other.append(this_choice)	6324	other.append(this_choice)
6324	else:	6325	else:
Lines 6332-6337 Link Here
6332	# into \|\| ( highest version ... lowest version ). We want to prefer the	6333	# into \|\| ( highest version ... lowest version ). We want to prefer the
6333	# highest all_available version of the new-style virtual when there is a	6334	# highest all_available version of the new-style virtual when there is a
6334	# lower all_installed version.	6335	# lower all_installed version.
		6336	preferred.extend(preferred_not_installed)
6335	preferred.extend(preferred_any_slot)	6337	preferred.extend(preferred_any_slot)
6336	preferred.extend(possible_upgrades)	6338	preferred.extend(possible_upgrades)
6337	possible_upgrades = preferred[1:]	6339	possible_upgrades = preferred[1:]