[gentoo-commits] portage r14825 - main/branches/2.1.7/pym/_emerge

[gentoo-commits] portage r14825 - main/branches/2.1.7/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-11-16 00:28:55 +0000 (Mon, 16 Nov 2009)
New Revision: 14825

Modified:
   main/branches/2.1.7/pym/_emerge/depgraph.py
Log:
When displaying masking messages, show the 'dependency required by' message
before the masking docs message. (trunk r14802)

Modified: main/branches/2.1.7/pym/_emerge/depgraph.py
===================================================================
--- main/branches/2.1.7/pym/_emerge/depgraph.py	2009-11-16 00:23:08 UTC (rev 14824)
+++ main/branches/2.1.7/pym/_emerge/depgraph.py	2009-11-16 00:28:55 UTC (rev 14825)
@@ -2196,6 +2196,8 @@
 			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 @@
 				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 @@
 
 		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.