diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-10-23 06:28:06 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-10-23 06:28:06 +0000 |
commit | db85f2b81ef607357fe2eaa8719192a2edd62e77 (patch) | |
tree | 31cfcf28b19f79d7c5c0321cb34f2ec0a4d8af66 /pym/_emerge/Scheduler.py | |
parent | 351ae4f408f327def14b13c653a82a5e96278ee0 (diff) | |
download | portage-db85f2b81ef607357fe2eaa8719192a2edd62e77.tar.gz portage-db85f2b81ef607357fe2eaa8719192a2edd62e77.tar.bz2 portage-db85f2b81ef607357fe2eaa8719192a2edd62e77.zip |
Factor out duplicate "These are the packages that would be merged",
"Calculating dependencies", and spinner cleanup code.
svn path=/main/trunk/; revision=14704
Diffstat (limited to 'pym/_emerge/Scheduler.py')
-rw-r--r-- | pym/_emerge/Scheduler.py | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 4fcb9fc05..f969f7105 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() |