[Sblim-commit] gather NEWS, 1.110, 1.111 gatherer.init-redhat.in, 1.2, 1.3

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/gather
In directory vz-cvs-3.sog:/tmp/cvs-serv22357

Modified Files:
	NEWS gatherer.init-redhat.in 
Log Message:
Fixed 3429347: initscript incorrect return code

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/gather/NEWS,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- NEWS	27 Oct 2011 16:33:10 -0000	1.110
+++ NEWS	27 Oct 2011 16:46:32 -0000	1.111
@@ -7,6 +7,7 @@
 - 3419837 bad alloc and unsigned returns in metricVirt
 - 3397109 UnixProcess plugins occasionally crashes
 - 3429346 libvirt race conditions
+- 3429347 initscript incorrect return code
 
 Changes in Version 2.2.3
 ========================

Index: gatherer.init-redhat.in
===================================================================
RCS file: /cvsroot/sblim/gather/gatherer.init-redhat.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gatherer.init-redhat.in	2 Jun 2010 01:41:20 -0000	1.2
+++ gatherer.init-redhat.in	27 Oct 2011 16:46:32 -0000	1.3
@@ -68,9 +68,9 @@
 		;;
 	status)
 		status gatherd
-		RETVAL=$?
+		GATHERD_RETVAL=$?
 		status reposd
-		RETVAL=$?
+		RETVAL=$(( $GATHERD_RETVAL == 0 ? $? : $GATHERD_RETVAL ))
 		;;
 	force-reload)
 		reload