vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fapee...@apache.org
Subject svn commit: r1488252 - /vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
Date Fri, 31 May 2013 14:32:38 GMT
Author: fapeeler
Date: Fri May 31 14:32:38 2013
New Revision: 1488252

URL: http://svn.apache.org/r1488252
Log:
VCL-594


in a few conditionals, the check was not catching errors on the output array. The @ was missing.

Modified:
    vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm

Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm?rev=1488252&r1=1488251&r2=1488252&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Fri May 31 14:32:38 2013
@@ -1589,7 +1589,7 @@ sub _nodeset {
 		notify($ERRORS{'WARNING'}, 0, "failed to execute nodeset command for $computer_node_name");
 		return;
 	}
-	elsif (grep(/(Error:|nodeset failure)/, $output)) {
+	elsif (grep(/(Error:|nodeset failure)/, @$output)) {
 		notify($ERRORS{'WARNING'}, 0, "failed to execute nodeset command for $computer_node_name\ncommand:
$command\noutput:\n" . join("\n", @$output));
 		return;
 	}
@@ -1794,7 +1794,7 @@ sub _rpower {
 			notify($ERRORS{'WARNING'}, 0, "failed to execute rpower command for $computer_node_name");
 			return;
 		}
-		elsif (grep(/Error:/, $output)) {
+		elsif (grep(/Error:/, @$output)) {
 			notify($ERRORS{'WARNING'}, 0, "failed to issue rpower command for $computer_node_name\ncommand:
$command\noutput:\n" . join("\n", @$output));
 			next RPOWER_ATTEMPT;
 		}
@@ -1873,7 +1873,7 @@ sub _rinv {
 		notify($ERRORS{'WARNING'}, 0, "failed to execute rinv command for $computer_node_name");
 		return;
 	}
-	elsif (grep(/Error:/, $output)) {
+	elsif (grep(/Error:/, @$output)) {
 		notify($ERRORS{'WARNING'}, 0, "failed to issue rinv command for $computer_node_name\ncommand:
$command\noutput:\n" . join("\n", @$output));
 		return;
 	}



Mime
View raw message