summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-11-16 00:28:55 +0000
committerZac Medico <zmedico@gentoo.org>2009-11-16 00:28:55 +0000
commit74a2e2571ea496c60be07c9c41edc029f80fa84d (patch)
tree1fb2b9112875a2d39b683befa8de8ef57cce2ec5
parentc1a5910e6b1e079db94747b0f630bbcb12f13854 (diff)
downloadportage-74a2e2571ea496c60be07c9c41edc029f80fa84d.tar.gz
portage-74a2e2571ea496c60be07c9c41edc029f80fa84d.tar.bz2
portage-74a2e2571ea496c60be07c9c41edc029f80fa84d.zip
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
-rw-r--r--pym/_emerge/depgraph.py8
1 files changed, 7 insertions, 1 deletions
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.