commit:     a95a27fdf101188e41a6e803f664610f9826925a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 21:31:19 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 21:39:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a95a27fd

bin/*-functions.sh: remove unnecessary sleep loops

Fixes: 46cafb3996d8 ("Remove all \a (alert/bell/beep) tokens (bug 336024)")

 bin/misc-functions.sh  | 2 +-
 bin/phase-functions.sh | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 15651b9..58755a1 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -396,7 +396,7 @@ preinst_suid_scan() {
                                        __vecho "- ${install_path} is an 
approved suid file"
                                else
                                        __vecho ">>> Removing sbit on non 
registered ${install_path}"
-                                       for x in 5 4 3 2 1 0; do sleep 0.25 ; 
done
+                                       LC_ALL=C sleep 1.5
                                        ls_ret=$(ls -ldh "${i}")
                                        chmod ugo-s "${i}"
                                        grep "^#${install_path}$" "${sfconf}" > 
/dev/null || {

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 6a47fed..d75f43f 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -985,12 +985,7 @@ __ebuild_main() {
                                        "You have 5 seconds to abort..."
                                echo
 
-                               local x
-                               for x in 1 2 3 4 5 6 7 8; do
-                                       LC_ALL=C sleep 0.25
-                               done
-
-                               sleep 3
+                               sleep 5
                        fi
 
                        cd "$PORTAGE_BUILDDIR"

Reply via email to