From 91d52ba2f4f3ee1c7e83d6a451746976106743aa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 24 Apr 2008 03:37:44 +0000 Subject: Combine --nodeps spinner logic. (trunk r9953) svn path=/main/branches/2.1.2/; revision=9958 --- bin/emerge | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index ee6edf736..983ff5034 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1730,8 +1730,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. @@ -7350,6 +7348,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): @@ -7373,9 +7375,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) -- cgit v1.2.3-1-g7c22