SOURCES: nagios-notify-statusfile.patch - better check (thanks Qrc...

arekm arekm at pld-linux.org
Tue Apr 8 11:58:11 CEST 2008


Author: arekm                        Date: Tue Apr  8 09:58:11 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- better check (thanks Qrczak)

---- Files affected:
SOURCES:
   nagios-notify-statusfile.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/nagios-notify-statusfile.patch
diff -u SOURCES/nagios-notify-statusfile.patch:1.1 SOURCES/nagios-notify-statusfile.patch:1.2
--- SOURCES/nagios-notify-statusfile.patch:1.1	Tue Apr  8 11:38:44 2008
+++ SOURCES/nagios-notify-statusfile.patch	Tue Apr  8 11:58:06 2008
@@ -1,16 +1,15 @@
 diff -urN nagios-notify-0.9.5.org/nagios-notify nagios-notify-0.9.5/nagios-notify
 --- nagios-notify-0.9.5.org/nagios-notify	2006-08-04 03:11:30.000000000 +0200
-+++ nagios-notify-0.9.5/nagios-notify	2008-04-08 11:22:51.505512189 +0200
-@@ -28,8 +28,10 @@
++++ nagios-notify-0.9.5/nagios-notify	2008-04-08 11:41:08.871305868 +0200
+@@ -28,7 +28,10 @@
  	}' | sed -f - $tmpl
  }
  
 -if [ -z "$NAGIOS_STATUSDATAFILE" ]; then
--	echo >&2 "$prog: This program must be ran from Nagios."
-+NAGIOS_STATUSDATAFILE=${NAGIOS_STATUSDATAFILE:-/var/lib/nagios/status.dat}
 +
-+if [ -f "$NAGIOS_STATUSDATAFILE" ]; then
-+	echo >&2 "$prog: Nagios status.dat file not found."
++if [ "${NAGIOS_STATUSDATAFILE+X}" = X ]; then
++	NAGIOS_STATUSDATAFILE=${NAGIOS_STATUSDATAFILE:-/var/lib/nagios/status.dat}
++else
+ 	echo >&2 "$prog: This program must be ran from Nagios."
  	exit 1
  fi
- 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/nagios-notify-statusfile.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list