packages: nagios-plugin-check_raid/check_raid - avoid global $status variab...

[glen]

Author: glen                         Date: Thu Sep 10 14:51:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid global $status variable overwrite

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.29 packages/nagios-plugin-check_raid/check_raid:1.30
--- packages/nagios-plugin-check_raid/check_raid:1.29	Thu Sep 10 11:34:53 2009
+++ packages/nagios-plugin-check_raid/check_raid	Thu Sep 10 16:51:36 2009
@@ -350,11 +350,11 @@
 		while (<$fh>) {
 			chomp;
 			last if (/Array Drives:/); # Stop after the Logical Drive block
-			if (my ($num, $status) = m/^\s+Number:\s+(\d+)\s+Status:\s+(\S+)$/) {
-				if ($status ne "ok") {
+			if (my ($num, $s) = m/^\s+Number:\s+(\d+)\s+Status:\s+(\S+)$/) {
+				if ($s ne "ok") {
 					$status = $ERRORS{CRITICAL} unless $status;
 				}
-				$message .= "gdth:$controller,$num:$status ";
+				$message .= "gdth:$controller,$num:$s ";
 			}
 		}
 		close($fh);
@@ -367,11 +367,11 @@
 		my ($controller) = $file =~ m{([^/]+$)};
 		while (<$fh>) {
 			chomp;
-			if (my ($c, $t, $l, $status) = m/TID=\d+, \(Channel=(\d+), Target=(\d+), Lun=(\d+)\)  \((\S+)\)/) {
-				if ($status ne "online") {
+			if (my ($c, $t, $l, $s) = m/TID=\d+, \(Channel=(\d+), Target=(\d+), Lun=(\d+)\)  \((\S+)\)/) {
+				if ($s ne "online") {
 					$status = $ERRORS{CRITICAL} unless $status;
 				}
-				$message .= "dpt_i2o:$c,$t,$l:$status ";
+				$message .= "dpt_i2o:$c,$t,$l:$s ";
 			}
 		}
 		close($fh);
================================================================

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