summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-04-24 02:31:09 +0000
committerZac Medico <zmedico@gentoo.org>2008-04-24 02:31:09 +0000
commit7bf09a0a02c91573f340b3322143db77adc43f6e (patch)
tree192d23042fd5075338730dc38820ccb13865e0b9
parent8d3c742732e23e3bb5f4b52d803eda58b6ebe457 (diff)
downloadportage-7bf09a0a02c91573f340b3322143db77adc43f6e.tar.gz
portage-7bf09a0a02c91573f340b3322143db77adc43f6e.tar.bz2
portage-7bf09a0a02c91573f340b3322143db77adc43f6e.zip
Combine --nodeps spinner logic.
svn path=/main/trunk/; revision=9953
-rw-r--r--pym/_emerge/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e7b5f6878..dd80a1679 100644
--- 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)