Author: arkurth
Date: Wed May 16 21:09:40 2012
New Revision: 1339365

URL: http://svn.apache.org/viewvc?rev=1339365&view=rev
Log:
VCL-503
Fixed problem in OS.pm::execute_new where it thought the SSH attempt failed if 
there is no initialization output.

Modified:
    incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm

Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm?rev=1339365&r1=1339364&r2=1339365&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm Wed May 16 21:09:40 
2012
@@ -1963,8 +1963,6 @@ sub execute_new {
                # Calling 'return' in the EVAL block doesn't exit this 
subroutine
                # Use a flag to determine if null should be returned without 
making another attempt
                my $return_null;
-               my $initialization_output;
-               my $initialization_error;
                
                if (!$ENV{net_ssh_expect}{$computer_name}) {
                        eval {
@@ -2018,8 +2016,6 @@ sub execute_new {
                                }
                                else {
                                        notify($ERRORS{'DEBUG'}, 0, 
$attempt_string . "SSH initialization output is undefined") if 
($display_output);
-                                       $initialization_error = 1;
-                                       return;
                                }
                        };
                        
@@ -2034,9 +2030,6 @@ sub execute_new {
                                }
                                next ATTEMPT;
                        }
-                       elsif ($initialization_error) {
-                               next ATTEMPT;
-                       }
                }
                else {
                        $ssh = $ENV{net_ssh_expect}{$computer_name};


Reply via email to