vcl-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arku...@apache.org
Subject svn commit: r1787857 - /vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm
Date Mon, 20 Mar 2017 22:29:51 GMT
Author: arkurth
Date: Mon Mar 20 22:29:51 2017
New Revision: 1787857

URL: http://svn.apache.org/viewvc?rev=1787857&view=rev
Log:
VCL-865
Updated 'if (defined(@$x))' calls in vbox.pm to 'if (defined($x))'.

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

Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm?rev=1787857&r1=1787856&r2=1787857&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vbox.pm Mon Mar 20 22:29:51 2017
@@ -858,11 +858,11 @@ sub does_image_exist {
 	
 	# If the partner doesn't have the image, a "no such file" error should be displayed
 	my $image_files_exist;
-	if (defined(@$du_output) && grep(/no such file/i, @$du_output)) {
+	if (defined($du_output) && grep(/no such file/i, @$du_output)) {
 		notify($ERRORS{'OK'}, 0, "$image_name does NOT exist");
 		$image_files_exist = 0;
 	}
-	elsif (defined(@$du_output) && !grep(/\d+\s+total/i, @$du_output)) {
+	elsif (defined($du_output) && !grep(/\d+\s+total/i, @$du_output)) {
 		notify($ERRORS{'WARNING'}, 0, "du output does not contain a total line:\n" . join("\n",
@$du_output));
 		return;
 	}
@@ -982,11 +982,11 @@ sub retrieve_image {
 		my ($du_exit_status, $du_output) = run_ssh_command($partner, $partner_image_lib_key, "du
-c $image_repository_path_remote\/*$image_name* | grep total", $partner_image_lib_user, $partner_ssh_port,
1);
 		
 		# If the partner doesn't have the image, a "no such file" error should be displayed
-		if (defined(@$du_output) && grep(/no such file/i, @$du_output)) {
+		if (defined($du_output) && grep(/no such file/i, @$du_output)) {
 			notify($ERRORS{'OK'}, 0, "$image_name does NOT exist on $partner_hostname");
 			next;
 		}
-		elsif (defined(@$du_output) && !grep(/\d+\s+total/i, @$du_output)) {
+		elsif (defined($du_output) && !grep(/\d+\s+total/i, @$du_output)) {
 			notify($ERRORS{'WARNING'}, 0, "du output does not contain a total line:\n" . join("\n",
@$du_output));
 			next;
 		}



Mime
View raw message