| 1 |
commit: a95a27fdf101188e41a6e803f664610f9826925a |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 24 21:31:19 2016 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 24 21:39:09 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a95a27fd |
| 7 |
|
| 8 |
bin/*-functions.sh: remove unnecessary sleep loops |
| 9 |
|
| 10 |
Fixes: 46cafb3996d8 ("Remove all \a (alert/bell/beep) tokens (bug 336024)") |
| 11 |
|
| 12 |
bin/misc-functions.sh | 2 +- |
| 13 |
bin/phase-functions.sh | 7 +------ |
| 14 |
2 files changed, 2 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh |
| 17 |
index 15651b9..58755a1 100755 |
| 18 |
--- a/bin/misc-functions.sh |
| 19 |
+++ b/bin/misc-functions.sh |
| 20 |
@@ -396,7 +396,7 @@ preinst_suid_scan() { |
| 21 |
__vecho "- ${install_path} is an approved suid file" |
| 22 |
else |
| 23 |
__vecho ">>> Removing sbit on non registered ${install_path}" |
| 24 |
- for x in 5 4 3 2 1 0; do sleep 0.25 ; done |
| 25 |
+ LC_ALL=C sleep 1.5 |
| 26 |
ls_ret=$(ls -ldh "${i}") |
| 27 |
chmod ugo-s "${i}" |
| 28 |
grep "^#${install_path}$" "${sfconf}" > /dev/null || { |
| 29 |
|
| 30 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
| 31 |
index 6a47fed..d75f43f 100644 |
| 32 |
--- a/bin/phase-functions.sh |
| 33 |
+++ b/bin/phase-functions.sh |
| 34 |
@@ -985,12 +985,7 @@ __ebuild_main() { |
| 35 |
"You have 5 seconds to abort..." |
| 36 |
echo |
| 37 |
|
| 38 |
- local x |
| 39 |
- for x in 1 2 3 4 5 6 7 8; do |
| 40 |
- LC_ALL=C sleep 0.25 |
| 41 |
- done |
| 42 |
- |
| 43 |
- sleep 3 |
| 44 |
+ sleep 5 |
| 45 |
fi |
| 46 |
|
| 47 |
cd "$PORTAGE_BUILDDIR" |
Archives