diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-01-30 12:35:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-01-30 12:35:07 +0000 |
| commit | 5ccae126dfa6dafe2da736dc6def881b4ccf1fb7 (patch) | |
| tree | 00773059656a46ff3adf0b6f004919df26d79e99 | |
| parent | eb2b07ef27bc8f790e2ab280bbd19a012841f9cf (diff) | |
| download | portage-5ccae126dfa6dafe2da736dc6def881b4ccf1fb7.tar.gz portage-5ccae126dfa6dafe2da736dc6def881b4ccf1fb7.tar.bz2 portage-5ccae126dfa6dafe2da736dc6def881b4ccf1fb7.zip | |
get --nospinner from myopts instead of sys.argv so that it works with EMERGE_DEFAULT_OPTS
svn path=/main/trunk/; revision=2608
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 3 insertions, 3 deletions
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"]: |