| 1 |
commit: 9bcba040300459fab19778925727ccfc72f55e3d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 00:24:03 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 00:24:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9bcba040 |
| 7 |
|
| 8 |
Show merge list before "missed update" messages. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/depgraph.py | 2 ++ |
| 12 |
1 files changed, 2 insertions(+), 0 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 15 |
index e1c39bc..de7bd4a 100644 |
| 16 |
--- a/pym/_emerge/depgraph.py |
| 17 |
+++ b/pym/_emerge/depgraph.py |
| 18 |
@@ -585,6 +585,7 @@ class depgraph(object): |
| 19 |
if not missed_updates: |
| 20 |
return |
| 21 |
|
| 22 |
+ self._show_merge_list() |
| 23 |
backtrack_masked = [] |
| 24 |
|
| 25 |
for pkg, parent_atoms in missed_updates: |
| 26 |
@@ -627,6 +628,7 @@ class depgraph(object): |
| 27 |
if not missed_updates: |
| 28 |
return |
| 29 |
|
| 30 |
+ self._show_merge_list() |
| 31 |
msg = [] |
| 32 |
msg.append("\nWARNING: One or more updates have been " + \ |
| 33 |
"skipped due to a dependency conflict:\n\n") |
Archives