diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2006-09-20 08:59:55 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2006-09-20 08:59:55 +0000 |
| commit | c35fbafd582dc6276a99652a075825fad008b88d (patch) | |
| tree | 88f43433f88dc1052ff405f0639a9a27b04dcf0d /net-proxy | |
| parent | Clean out old version. (diff) | |
| download | gentoo-2-c35fbafd582dc6276a99652a075825fad008b88d.tar.gz gentoo-2-c35fbafd582dc6276a99652a075825fad008b88d.tar.bz2 gentoo-2-c35fbafd582dc6276a99652a075825fad008b88d.zip | |
Fix format of message displayed on service stop (#148005).
(Portage version: 2.1.1)
Diffstat (limited to 'net-proxy')
| -rw-r--r-- | net-proxy/squid/ChangeLog | 6 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid.initd | 10 | ||||
| -rw-r--r-- | net-proxy/squid/files/squid.initd-logrotate | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog index 744fb75174ee..8f8b373c0cfb 100644 --- a/net-proxy/squid/ChangeLog +++ b/net-proxy/squid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-proxy/squid # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.89 2006/09/05 06:03:06 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.90 2006/09/20 08:59:55 mrness Exp $ + + 20 Sep 2006; Alin Nastac <mrness@gentoo.org> files/squid.initd, + files/squid.initd-logrotate: + Fix format of message displayed on service stop (#148005). 05 Sep 2006; Joshua Kinard <kumba@gentoo.org> squid-2.5.14.ebuild: Marked stable on mips. diff --git a/net-proxy/squid/files/squid.initd b/net-proxy/squid/files/squid.initd index 736e91a4fdd7..29fda35bf202 100644 --- a/net-proxy/squid/files/squid.initd +++ b/net-proxy/squid/files/squid.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.5 2006/01/18 21:46:22 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd,v 1.6 2006/09/20 08:59:55 mrness Exp $ opts="${opts} reload rotate" @@ -56,22 +56,22 @@ stop() { # Now we have to wait until squid has _really_ stopped. sleep 1 if [ -f /var/run/squid.pid ] ; then - einfon "Waiting ." + einfon "Waiting for squid to shutdown ." cnt=0 while [ -f /var/run/squid.pid ] ; do cnt=`expr $cnt + 1` if [ $cnt -gt 60 ] ; then # Waited 120 seconds now. Fail. + echo eend 1 "Failed." break fi sleep 2 echo -n "." done - eend 0 - else - eend 0 + echo fi + eend 0 } reload() { diff --git a/net-proxy/squid/files/squid.initd-logrotate b/net-proxy/squid/files/squid.initd-logrotate index cdde5a8a8efe..5fda1fe35876 100644 --- a/net-proxy/squid/files/squid.initd-logrotate +++ b/net-proxy/squid/files/squid.initd-logrotate @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.3 2006/01/18 21:46:22 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/files/squid.initd-logrotate,v 1.4 2006/09/20 08:59:55 mrness Exp $ opts="${opts} reload" @@ -56,22 +56,22 @@ stop() { # Now we have to wait until squid has _really_ stopped. sleep 1 if [ -f /var/run/squid.pid ] ; then - einfon "Waiting ." + einfon "Waiting for squid to shutdown ." cnt=0 while [ -f /var/run/squid.pid ] ; do cnt=`expr $cnt + 1` if [ $cnt -gt 60 ] ; then # Waited 120 seconds now. Fail. + echo eend 1 "Failed." break fi sleep 2 echo -n "." done - eend 0 - else - eend 0 + echo fi + eend 0 } reload() { |