diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-09-01 17:24:03 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-09-01 17:24:03 -0700 |
commit | 9bcba040300459fab19778925727ccfc72f55e3d (patch) | |
tree | 0ff0df3a375013b294417884cea2fc875c2c129d | |
parent | 5e15e5830a915c614cd81f6a87b2e73ac116368d (diff) | |
download | portage-9bcba040300459fab19778925727ccfc72f55e3d.tar.gz portage-9bcba040300459fab19778925727ccfc72f55e3d.tar.bz2 portage-9bcba040300459fab19778925727ccfc72f55e3d.zip |
Show merge list before "missed update" messages.
-rw-r--r-- | pym/_emerge/depgraph.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e1c39bc0f..de7bd4abf 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -585,6 +585,7 @@ class depgraph(object): if not missed_updates: return + self._show_merge_list() backtrack_masked = [] for pkg, parent_atoms in missed_updates: @@ -627,6 +628,7 @@ class depgraph(object): if not missed_updates: return + self._show_merge_list() msg = [] msg.append("\nWARNING: One or more updates have been " + \ "skipped due to a dependency conflict:\n\n") |