From cf116abe939ab4e011e5167eaef60a23b3648ed2 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Thu, 30 Mar 2017 12:18:49 +0200 Subject: [PATCH] F #4913: Ignore error if file to be deleted does not exist --- .../remotes/lib/vcenter_driver/datastore.rb | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb index db51f38f1c..27e71ff2a3 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/datastore.rb @@ -239,10 +239,17 @@ class Datastore < Storage def delete_virtual_disk(img_name) ds_name = self['name'] - get_vdm.DeleteVirtualDisk_Task( - :name => "[#{ds_name}] #{img_name}", - :datacenter => get_dc.item - ).wait_for_completion + begin + get_vdm.DeleteVirtualDisk_Task( + :name => "[#{ds_name}] #{img_name}", + :datacenter => get_dc.item + ).wait_for_completion + rescue Exception => e + # Ignore if file not found + if !e.message.start_with?('ManagedObjectNotFound') + raise e + end + end end # Copy a VirtualDisk