From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 30 Jan 2006 12:35:07 +0000 (-0000)
Subject: get --nospinner from myopts instead of sys.argv so that it works with EMERGE_DEFAULT_OPTS
X-Git-Tag: v2.1_pre5_2760~121
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5ccae126dfa6dafe2da736dc6def881b4ccf1fb7;p=portage.git

get --nospinner from myopts instead of sys.argv so that it works with EMERGE_DEFAULT_OPTS

svn path=/main/trunk/; revision=2608
---

diff --git a/bin/emerge b/bin/emerge
index eba9a3d19..e0d043912 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -72,9 +72,6 @@ update_spinner = update_twirl_spinner
 if "candy" in portage.settings.features:
 	spinner = spinner_msgs[int(time.time()*100)%len(spinner_msgs)]
 	update_spinner = update_scroll_spinner
-if not sys.stdout.isatty() or ("--nospinner" in sys.argv):
-	update_spinner = update_basic_spinner
-
 
 if (not sys.stdout.isatty()) or (portage.settings["NOCOLOR"] in ["yes","true"]):
 	nocolor()
@@ -431,6 +428,9 @@ if ("--resume" in myopts):
 if ("--nocolor" in myopts) and (sys.stdout.isatty()):
 	nocolor()
 
+if not sys.stdout.isatty() or ("--nospinner" in myopts):
+	update_spinner = update_basic_spinner
+
 CLEAN_DELAY = 5
 EMERGE_WARNING_DELAY = 10
 if portage.settings["CLEAN_DELAY"]: