From 8f32fafae2889baed38c0c7f7524da433d0ecb50 Mon Sep 17 00:00:00 2001 From: Tino Vazquez <cvazquez@opennebula.io> Date: Fri, 30 Apr 2021 10:35:51 +0200 Subject: [PATCH] B #5366: Fix extra new line in description Applies to VMs imported from vCenter. (cherry picked from commit 4c1deb51e1f01b45b4ebe7bfa95871ed1c9e0035) --- src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb index 2ecbf5376b..17288d3070 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/vm_template.rb @@ -1573,9 +1573,8 @@ module VCenterDriver str << "]\n" if annotation.nil? || annotation.empty? - str << 'DESCRIPTION = "vCenter Template \ - imported by OpenNebula' \ - " from Cluster #{ccr_name}\"\n" + str << 'DESCRIPTION = "vCenter Template imported by OpenNebula'\ + " from Cluster #{ccr_name}\"\n" else notes = annotation.gsub('\\', '\\\\').gsub('"', '\\"') str << "DESCRIPTION = \"#{notes}\"\n"