Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 196045 Details for
Bug 275796
[PATCH] emerge should prefer packages already in the dep graph over installed packages
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Make dep_zapdeps prefer packages already in the graph over installed packages.
portage-dep_zapdeps-prefer-packages-in-the-graph-over-installed-packages.patch (text/plain), 3.17 KB, created by
Sebastian Luther (few)
on 2009-06-29 09:07:39 UTC
(
hide
)
Description:
Make dep_zapdeps prefer packages already in the graph over installed packages.
Filename:
MIME Type:
Creator:
Sebastian Luther (few)
Created:
2009-06-29 09:07:39 UTC
Size:
3.17 KB
patch
obsolete
>Index: pym/portage/__init__.py >=================================================================== >--- pym/portage/__init__.py (revision 13732) >+++ pym/portage/__init__.py (working copy) >@@ -7050,10 +7050,10 @@ > # c) contains masked installed packages > # d) is the first item > >- preferred = [] >- preferred_not_installed = [] >+ preferred_installed = [] >+ preferred_in_graph = [] > preferred_any_slot = [] >- possible_upgrades = [] >+ preferred_non_installed = [] > other = [] > > # Alias the trees we'll be checking availability against >@@ -7067,15 +7067,15 @@ > else: > mydbapi = trees[myroot]["porttree"].dbapi > >- # Sort the deps into preferred (installed) and other >- # with values of [[required_atom], availablility] >+ # Sort the deps into installed, not installed but already >+ # in the graph and other, not installed and not in the graph >+ # and other, with values of [[required_atom], availablility] > for dep, satisfied in izip(deps, satisfieds): > if isinstance(dep, list): > atoms = dep_zapdeps(dep, satisfied, myroot, > use_binaries=use_binaries, trees=trees) > else: > atoms = [dep] >- > if not vardb: > # called by repoman > other.append((atoms, None, False)) >@@ -7100,8 +7100,8 @@ > this_choice = (atoms, versions, all_available) > if all_available: > # The "all installed" criterion is not version or slot specific. >- # If any version of a package is installed then we assume that it >- # is preferred over other possible packages choices. >+ # If any version of a package is already in the graph then we >+ #assume that it is preferred over other possible packages choices. > all_installed = True > for atom in set([dep_getkey(atom) for atom in atoms \ > if atom[:1] != "!"]): >@@ -7120,7 +7120,7 @@ > break > if all_installed: > if all_installed_slots: >- preferred.append(this_choice) >+ preferred_installed.append(this_choice) > else: > preferred_any_slot.append(this_choice) > elif graph_db is None: >@@ -7135,7 +7135,7 @@ > break > if all_in_graph: > if parent is None: >- preferred_not_installed.append(this_choice) >+ preferred_in_graph.append(this_choice) > else: > # Check if the atom would result in a direct circular > # dependency and try to avoid that if it seems likely >@@ -7155,11 +7155,11 @@ > circular_atom = atom > break > if circular_atom is None: >- preferred_not_installed.append(this_choice) >+ preferred_in_graph.append(this_choice) > else: > other.append(this_choice) > else: >- possible_upgrades.append(this_choice) >+ preferred_non_installed.append(this_choice) > else: > other.append(this_choice) > >@@ -7169,9 +7169,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) >+ preferred = preferred_in_graph + preferred_installed + preferred_any_slot + preferred_non_installed > possible_upgrades = preferred[1:] > for possible_upgrade in possible_upgrades: > atoms, versions, all_available = possible_upgrade
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 275796
: 196045