summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-02-02 15:51:00 -0800
committerZac Medico <zmedico@gentoo.org>2011-02-02 15:51:00 -0800
commitebc2fafe4a7261ba6e97c3f0ec134b7ca542d1d7 (patch)
tree50ddd8e344887f72d033cda14294de82d457ff19
parentc9c96a2be41eafa00c499c658b8950f7e27c0ad8 (diff)
downloadportage-ebc2fafe4a7261ba6e97c3f0ec134b7ca542d1d7.tar.gz
portage-ebc2fafe4a7261ba6e97c3f0ec134b7ca542d1d7.tar.bz2
portage-ebc2fafe4a7261ba6e97c3f0ec134b7ca542d1d7.zip
REQUIRED_USE: handle unsatisfied like normal dep
-rw-r--r--pym/_emerge/depgraph.py23
1 files changed, 6 insertions, 17 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 45873af13..2f8037aa0 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -197,7 +197,6 @@ class _dynamic_depgraph_config(object):
self._initially_unsatisfied_deps = []
self._ignored_deps = []
self._highest_pkg_cache = {}
- self._pkg_config_issues = {}
self._needed_unstable_keywords = backtrack_parameters.needed_unstable_keywords
self._needed_license_changes = backtrack_parameters.needed_license_changes
@@ -355,8 +354,7 @@ class depgraph(object):
# missed update from each SLOT.
missed_updates = {}
for pkg, mask_reasons in \
- chain(self._dynamic_config._runtime_pkg_mask.items(),
- self._dynamic_config._pkg_config_issues.items()):
+ self._dynamic_config._runtime_pkg_mask.items():
if pkg.installed:
# Exclude installed here since we only
# want to show available updates.
@@ -385,13 +383,6 @@ class depgraph(object):
missed_update_types.pop("slot conflict", None)
missed_update_types.pop("missing dependency", None)
- required_use = missed_update_types.pop("required use", None)
- if required_use is not None:
- # For display purposes, unsatisfied REQUIRED_USE
- # can be treated like a missing dependency.
- missed_update_types.setdefault("missing dependency",
- []).extend(required_use)
-
self._show_missed_update_slot_conflicts(
missed_update_types.get("slot conflict"))
@@ -844,13 +835,11 @@ class depgraph(object):
parent, atom = parent_atom
self._add_parent_atom(pkg, parent_atom)
- config_issues = \
- self._dynamic_config._pkg_config_issues.setdefault(pkg, {})
- parent_atoms = config_issues.setdefault("required use", set())
- all_parent_atoms = self._dynamic_config._parent_atoms.get(pkg)
- if all_parent_atoms is not None:
- for parent, atom in all_parent_atoms:
- parent_atoms.add((parent, pkg.root, atom))
+ atom = dep.atom
+ if atom is None:
+ atom = Atom("=" + pkg.cpv)
+ self._dynamic_config._unsatisfied_deps_for_display.append(
+ ((pkg.root, atom), {"myparent":dep.parent}))
return 0
if not pkg.onlydeps: