[vcl] branch develop updated: VCL-1120 - image conversion from vmdk to qcow2 always done twice

[jf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jfthomps pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/vcl.git


The following commit(s) were added to refs/heads/develop by this push:
     new 80705e8  VCL-1120 - image conversion from vmdk to qcow2 always done twice
80705e8 is described below

commit 80705e80a8abdb91e99ee3ff97be13368c9a4981
Author: Josh Thompson <jf...@ncsu.edu>
AuthorDate: Tue Apr 30 08:29:59 2019 -0400

    VCL-1120 - image conversion from vmdk to qcow2 always done twice
    
    KVM.pm: modified copy_virtual_disk: fixed misplaced close paranthesis in if conditional checking for 'Unknown option.*compat' that was causing it to always be true that resulted in image conversions from vmdk to qcow2 always being done twice
---
 managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm b/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm
index 43741eb..e183690 100644
--- a/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm
+++ b/managementnode/lib/VCL/Module/Provisioning/libvirt/KVM.pm
@@ -621,7 +621,7 @@ sub copy_virtual_disk {
 	
 	my $start_time = time;
 	my ($exit_status, $output) = $self->vmhost_os->execute($command, 0, 7200);
-	if (defined($output && grep(/Unknown option.*compat/, @$output))) {
+	if (defined($output) && grep(/Unknown option.*compat/, @$output)) {
 		# Check for older versions which don't support '-o compat=':
 		#    Unknown option 'compat'
 		#    qemu-img: Invalid options for file format 'qcow2'.