From 88d7b58a8379676ffafb0c13d69c08696ab68177 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 24 Oct 2009 07:04:54 +0000 Subject: Factor out duplicate "These are the packages that would be merged", "Calculating dependencies", and spinner cleanup code. (trunk r14704) svn path=/main/branches/2.1.7/; revision=14713 --- pym/_emerge/Scheduler.py | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'pym/_emerge/Scheduler.py') diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index db1aecc79..598ab659e 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1490,28 +1490,6 @@ class Scheduler(PollScheduler): """ print(colorize("GOOD", "*** Resuming merge...")) - if self._show_list(): - if "--tree" in self.myopts: - if "--unordered-display" in self.myopts: - portage.writemsg_stdout("\n" + \ - darkgreen("These are the packages that " + \ - "would be merged:") + "\n\n") - else: - 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 - - if show_spinner: - print("Calculating dependencies ", end=' ') - myparams = create_depgraph_params(self.myopts, None) success = False e = None @@ -1527,9 +1505,6 @@ class Scheduler(PollScheduler): mydepgraph = e.depgraph dropped_tasks = set() - if show_spinner: - print("\b\b... done!") - if e is not None: def unsatisfied_resume_dep_msg(): mydepgraph.display_problems() -- cgit v1.2.3-1-g7c22