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 eba9a3d193fd7285466ece960bc7508838589a81..e0d04391280ffc04f85f3a1b9e86a5e4f8dba3c1 100755 (executable)
--- 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"]: