packages: nagios-plugin-check_raid/check_raid - fixes for arcconf with batt...

[glen]

Author: glen                         Date: Fri Sep 11 14:08:40 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixes for arcconf with battery installed

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.42 packages/nagios-plugin-check_raid/check_raid:1.43
--- packages/nagios-plugin-check_raid/check_raid:1.42	Fri Sep 11 15:46:45 2009
+++ packages/nagios-plugin-check_raid/check_raid	Fri Sep 11 16:08:35 2009
@@ -515,7 +515,7 @@
 
 			if ($s eq "Charging") {
 				$status = $ERRORS{WARNING} unless $status;
-			} elsif ($s != "Optimal") {
+			} elsif ($s ne "Optimal") {
 				$status = $ERRORS{CRITICAL};
 			}
 			push(@status, "Battery Status: $s");
@@ -551,9 +551,9 @@
 			}
 
 			if ($mins < 60) {
-				push(@status, "Battery Time: $mins mins");
+				push(@status, "Battery Time: ${m}m");
 			} else {
-				push(@status, "Battery Time: ".($mins/60) + "hours");
+				push(@status, "Battery Time: ${d}d, ${h}h, ${m}m");
 			}
 			next;
 		}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_raid/check_raid?r1=1.42&r2=1.43&f=u