summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-04 04:24:15 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-04 04:24:15 +0000
commite13a7002efcc76474d4342da985114afe96e4979 (patch)
tree70183273707b13d27d57fc48b6a729edd7bb97eb
parenta296f6b927e01bc06fa8127cf8a2d44084bd62d4 (diff)
downloadportage-e13a7002efcc76474d4342da985114afe96e4979.tar.gz
portage-e13a7002efcc76474d4342da985114afe96e4979.tar.bz2
portage-e13a7002efcc76474d4342da985114afe96e4979.zip
Display blockers at the end of the list so that it will more often be easy for the user to see them in a terminal. Thanks to iapitus and hydrogen for the suggestion.
svn path=/main/trunk/; revision=6169
-rw-r--r--pym/emerge/__init__.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 0721915b6..a5ad88afb 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2255,6 +2255,7 @@ class depgraph:
"--verbose" in self.myopts and 3 or 2)
changelogs=[]
p=[]
+ blockers = []
counters = PackageCounters()
@@ -2425,17 +2426,18 @@ class depgraph:
resolved = portage.key_expand(
pkg_key, mydb=vardb, settings=pkgsettings)
if "--columns" in self.myopts and "--quiet" in self.myopts:
- print addl,red(resolved),
+ addl = addl + " " + red(resolved)
else:
- print "["+x[0]+" "+addl+"]",red(resolved),
+ addl = "[blocks " + addl + "] " + red(resolved)
block_parents = self.blocker_parents[tuple(x)]
block_parents = set([pnode[2] for pnode in block_parents])
block_parents = ", ".join(block_parents)
if resolved!=x[2]:
- print bad("(\"%s\" is blocking %s)") % \
+ addl += bad(" (\"%s\" is blocking %s)") % \
(pkg_key, block_parents)
else:
- print bad("(is blocking %s)") % block_parents
+ addl += bad(" (is blocking %s)") % block_parents
+ blockers.append(addl)
else:
mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi
binary_package = True
@@ -2729,6 +2731,8 @@ class depgraph:
for x in p:
print x
+ for x in blockers:
+ print x
if verbosity == 3:
print