Combine --nodeps spinner logic.

svn path=/main/trunk/; revision=9953

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e7b5f6878322c617bd0dfa872aff776f21caddc1..dd80a1679e6550a2db9c2360c46ad92d9bf0a1dc 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1591,8 +1591,6 @@ class depgraph(object):
                self.edebug = 0
                if settings.get("PORTAGE_DEBUG", "") == "1":
                        self.edebug = 1
-               if "--nodeps" in myopts:
-                       spinner.update = spinner.update_quiet
                self.spinner = spinner
                self.pkgsettings = {}
                # Maps slot atom to package for each Package added to the graph.
@@ -7326,6 +7324,10 @@ def action_build(settings, trees, mtimedb,
                        else:
                                del mtimedb[k]
 
+       show_spinner = "--quiet" not in myopts and "--nodeps" not in myopts
+       if not show_spinner:
+               spinner.update = spinner.update_quiet
+
        if "--resume" in myopts and \
                ("resume" in mtimedb or
                "resume_backup" in mtimedb):
@@ -7349,9 +7351,6 @@ def action_build(settings, trees, mtimedb,
                for opt in ("--skipfirst", "--ask", "--tree"):
                        resume_opts.pop(opt, None)
                myopts.update(resume_opts)
-               show_spinner = "--quiet" not in myopts and "--nodeps" not in myopts
-               if not show_spinner:
-                       spinner.update = spinner.update_quiet
                if show_spinner:
                        print "Calculating dependencies  ",
                myparams = create_depgraph_params(myopts, myaction)