summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-04 04:25:18 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-04 04:25:18 +0000
commit06bf4685fcbdd603de86e46c54f5c1990af70c4c (patch)
tree621655a796c2405a46a26d1036fcf6ce23f704dd /bin/emerge
parentdc4287a3469df3e55da7c142fe3332195084d473 (diff)
downloadportage-06bf4685fcbdd603de86e46c54f5c1990af70c4c.tar.gz
portage-06bf4685fcbdd603de86e46c54f5c1990af70c4c.tar.bz2
portage-06bf4685fcbdd603de86e46c54f5c1990af70c4c.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. (trunk r6168:6169)
svn path=/main/branches/2.1.2/; revision=6170
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge12
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge
index 2f5e68aef..d5b870dd3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2252,6 +2252,7 @@ class depgraph:
"--verbose" in self.myopts and 3 or 2)
changelogs=[]
p=[]
+ blockers = []
counters = PackageCounters()
@@ -2422,17 +2423,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
@@ -2726,6 +2728,8 @@ class depgraph:
for x in p:
print x
+ for x in blockers:
+ print x
if verbosity == 3:
print