From e13a7002efcc76474d4342da985114afe96e4979 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 4 Mar 2007 04:24:15 +0000 Subject: 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 --- pym/emerge/__init__.py | 12 ++++++++---- 1 file 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 -- cgit v1.2.3-1-g7c22