From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 16 Nov 2009 00:28:55 +0000 (-0000)
Subject: When displaying masking messages, show the 'dependency required by' message
X-Git-Tag: v2.1.7.5~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74a2e2571ea496c60be07c9c41edc029f80fa84d;p=portage.git

When displaying masking messages, show the 'dependency required by' message
before the masking docs message. (trunk r14802)

svn path=/main/branches/2.1.7/; revision=14825
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 6dea92c94..96c3a2595 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2196,6 +2196,8 @@ class depgraph(object):
 			else:
 				show_missing_use = unmasked_iuse_reasons
 
+		mask_docs = False
+
 		if show_missing_use:
 			print("\nemerge: there are no ebuilds built with USE flags to satisfy "+green(xinfo)+".")
 			print("!!! One of the following packages is required to complete your request:")
@@ -2219,7 +2221,7 @@ class depgraph(object):
 				for line in wrap(msg, 75):
 					print(line)
 			print()
-			show_mask_docs()
+			mask_docs = True
 		else:
 			print("\nemerge: there are no ebuilds to satisfy "+green(xinfo)+".")
 
@@ -2254,6 +2256,10 @@ class depgraph(object):
 
 		print()
 
+		if mask_docs:
+			show_mask_docs()
+			print()
+
 	def _iter_match_pkgs(self, root_config, pkg_type, atom, onlydeps=False):
 		"""
 		Iterate over Package instances of pkg_type matching the given atom.