projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e15e58
)
Show merge list before "missed update" messages.
author
Zac Medico
<zmedico@gentoo.org>
Fri, 2 Sep 2011 00:24:03 +0000
(17:24 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Fri, 2 Sep 2011 00:24:03 +0000
(17:24 -0700)
pym/_emerge/depgraph.py
patch
|
blob
|
history
diff --git
a/pym/_emerge/depgraph.py
b/pym/_emerge/depgraph.py
index e1c39bc0f670efc58ad96f56c33d2205910b044a..de7bd4abf5c4d058f16559edeaabc5b518356106 100644
(file)
--- 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")