rpms/squid/devel squid.init,1.14,1.15 squid.spec,1.142,1.143

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/squid/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27168

Modified Files:
	squid.init squid.spec 
Log Message:
* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> - 7:3.1.0.13-4
- fixed #521596 - wrong return code of init script



Index: squid.init
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- squid.init	4 Sep 2009 03:39:42 -0000	1.14
+++ squid.init	15 Sep 2009 17:56:14 -0000	1.15
@@ -116,6 +116,9 @@ stop() {
 		echo
 	else
 		echo_failure
+		if [ ! -e /var/lock/subsys/$SQUID ]; then
+			RETVAL=0
+		fi
 		echo
 	fi
 	return $RETVAL
@@ -148,7 +151,7 @@ stop)
 	stop
 	;;
 
-reload)
+reload|force-reload)
 	reload
 	;;
 
@@ -156,7 +159,7 @@ restart)
 	restart
 	;;
 
-condrestart)
+condrestart|try-restart)
 	condrestart
 	;;
 
@@ -170,7 +173,7 @@ probe)
 	;;
 
 *)
-	echo $"Usage: $0 {start|stop|status|reload|restart|condrestart|probe}"
+	echo $"Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart|probe}"
 	exit 2
 esac
 


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/devel/squid.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -p -r1.142 -r1.143
--- squid.spec	8 Sep 2009 15:57:10 -0000	1.142
+++ squid.spec	15 Sep 2009 17:56:14 -0000	1.143
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.13
-Release:  3%{?dist}
+Release:  4%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -253,6 +253,9 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Sep 15 2009 Jiri Skala <jskala at redhat.com> - 7:3.1.0.13-4
+- fixed #521596 - wrong return code of init script
+
 * Tue Sep 08 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.13-3
 - Enable squid_kerb_auth