diff options
| -rw-r--r-- | pym/_emerge/DepPriority.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/DepPrioritySatisfiedRange.py | 31 | ||||
| -rw-r--r-- | pym/_emerge/depgraph.py | 12 |
3 files changed, 9 insertions, 36 deletions
diff --git a/pym/_emerge/DepPriority.py b/pym/_emerge/DepPriority.py index 252a81e82..3c2256a8e 100644 --- a/pym/_emerge/DepPriority.py +++ b/pym/_emerge/DepPriority.py @@ -4,7 +4,7 @@ from _emerge.AbstractDepPriority import AbstractDepPriority class DepPriority(AbstractDepPriority): - __slots__ = ("satisfied", "optional", "rebuild", "ignored") + __slots__ = ("satisfied", "optional", "ignored") def __int__(self): """ diff --git a/pym/_emerge/DepPrioritySatisfiedRange.py b/pym/_emerge/DepPrioritySatisfiedRange.py index 7fa2f0977..edb29df96 100644 --- a/pym/_emerge/DepPrioritySatisfiedRange.py +++ b/pym/_emerge/DepPrioritySatisfiedRange.py @@ -7,18 +7,17 @@ class DepPrioritySatisfiedRange(object): DepPriority Index Category not satisfied and buildtime HARD - not satisfied and runtime 7 MEDIUM - not satisfied and runtime_post 6 MEDIUM_SOFT - satisfied and buildtime and rebuild 5 SOFT + not satisfied and runtime 6 MEDIUM + not satisfied and runtime_post 5 MEDIUM_SOFT satisfied and buildtime 4 SOFT satisfied and runtime 3 SOFT satisfied and runtime_post 2 SOFT optional 1 SOFT (none of the above) 0 NONE """ - MEDIUM = 7 - MEDIUM_SOFT = 6 - SOFT = 5 + MEDIUM = 6 + MEDIUM_SOFT = 5 + SOFT = 4 NONE = 0 @classmethod @@ -51,21 +50,8 @@ class DepPrioritySatisfiedRange(object): def _ignore_satisfied_buildtime(cls, priority): if priority.__class__ is not DepPriority: return False - if priority.optional: - return True - if not priority.satisfied: - return False - if priority.buildtime: - return not priority.rebuild - return True - - @classmethod - def _ignore_satisfied_buildtime_rebuild(cls, priority): - if priority.__class__ is not DepPriority: - return False - if priority.optional: - return True - return bool(priority.satisfied) + return bool(priority.optional or \ + priority.satisfied) @classmethod def _ignore_runtime_post(cls, priority): @@ -85,7 +71,7 @@ class DepPrioritySatisfiedRange(object): ignore_medium = _ignore_runtime ignore_medium_soft = _ignore_runtime_post - ignore_soft = _ignore_satisfied_buildtime_rebuild + ignore_soft = _ignore_satisfied_buildtime DepPrioritySatisfiedRange.ignore_priority = ( @@ -94,7 +80,6 @@ DepPrioritySatisfiedRange.ignore_priority = ( DepPrioritySatisfiedRange._ignore_satisfied_runtime_post, DepPrioritySatisfiedRange._ignore_satisfied_runtime, DepPrioritySatisfiedRange._ignore_satisfied_buildtime, - DepPrioritySatisfiedRange._ignore_satisfied_buildtime_rebuild, DepPrioritySatisfiedRange._ignore_runtime_post, DepPrioritySatisfiedRange._ignore_runtime ) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3ef47f8ab..d09ee87ba 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1036,18 +1036,6 @@ class depgraph(object): return 0 if not pkg.onlydeps: - if not pkg.installed and \ - "empty" not in self._dynamic_config.myparams and \ - vardbapi.match(pkg.slot_atom): - # Increase the priority of dependencies on packages that - # are being rebuilt. This optimizes merge order so that - # dependencies are rebuilt/updated as soon as possible, - # which is needed especially when emerge is called by - # revdep-rebuild since dependencies may be affected by ABI - # breakage that has rendered them useless. Don't adjust - # priority here when in "empty" mode since all packages - # are being merged in that case. - priority.rebuild = True existing_node, existing_node_matches = \ self._check_slot_conflict(pkg, dep.atom) |