summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-04 13:58:30 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-04 13:58:30 +0000
commit43411c1f30d3c4591f549feb9aaf24c6c023b6d8 (patch)
treeab0d3bfd6db0b6b0622b6923d80f730966b4a3df
parent3e44eabc80796a02405b86bfaf0b5b70d6880242 (diff)
downloadportage-43411c1f30d3c4591f549feb9aaf24c6c023b6d8.tar.gz
portage-43411c1f30d3c4591f549feb9aaf24c6c023b6d8.tar.bz2
portage-43411c1f30d3c4591f549feb9aaf24c6c023b6d8.zip
In --keep-going mode, display the new merge list when appropriate.
svn path=/main/trunk/; revision=10928
-rw-r--r--pym/_emerge/__init__.py27
1 files changed, 26 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 82bbc97ef..72413191b 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7603,6 +7603,17 @@ class Scheduler(object):
"""
print colorize("GOOD", "*** Resuming merge...")
+ if self._show_list():
+ if "--tree" in self.myopts:
+ portage.writemsg_stdout("\n" + \
+ darkgreen("These are the packages that " + \
+ "would be merged, in reverse order:\n\n"))
+
+ else:
+ portage.writemsg_stdout("\n" + \
+ darkgreen("These are the packages that " + \
+ "would be merged, in order:\n\n"))
+
show_spinner = "--quiet" not in self.myopts and \
"--nodeps" not in self.myopts
@@ -7617,8 +7628,14 @@ class Scheduler(object):
if show_spinner:
print "\b\b... done!"
+ if self._show_list():
+ mylist = mydepgraph.altlist()
+ if "--tree" in self.myopts:
+ mylist.reverse()
+ mydepgraph.display(mylist, favorites=self._favorites)
+
+ mydepgraph.display_problems()
if not success:
- mydepgraph.display_problems()
return (None, None)
mylist = mydepgraph.altlist()
@@ -7626,6 +7643,14 @@ class Scheduler(object):
mydepgraph.break_refs(dropped_tasks)
return (mylist, dropped_tasks)
+ def _show_list(self):
+ myopts = self.myopts
+ if "--quiet" not in myopts and \
+ ("--ask" in myopts or "--tree" in myopts or \
+ "--verbose" in myopts):
+ return True
+ return False
+
def _register(self, f, eventmask, handler):
"""
@rtype: Integer