From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 Sep 2011 00:24:03 +0000 (-0700)
Subject: Show merge list before "missed update" messages.
X-Git-Tag: v2.2.0_alpha52~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9bcba040300459fab19778925727ccfc72f55e3d;p=portage.git

Show merge list before "missed update" messages.
---

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")