shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-24 02:03:52 +03:00
Code Releases Wiki Activity

Image delete function now copes with directories

Browse Source
This commit is contained in:
Tino Vázquez 2010-10-13 15:36:17 +02:00
parent 9d959c2e55
commit 3cc0f52988
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/oca/ruby/OpenNebula/ImageRepository.rb
View File

@ -218,10 +218,18 @@ module OpenNebula
######################################################################## ########################################################################
def remove(source) def remove(source)
if File.exists?(source) if File.exists?(source)
begin if File.directory?(source)
FileUtils.rm(source) begin
rescue Exception => e FileUtils.rmdir(source)
return OpenNebula::Error.new(e.message) rescue Exception => e
return OpenNebula::Error.new(e.message)
end
else
begin
FileUtils.rm(source)
rescue Exception => e
return OpenNebula::Error.new(e.message)
end
end end
end end