Fix bug in dockerloadformat and make sure we handle exceptions properly in the verb call

This commit is contained in:
Joseph Schorr 2014-10-08 13:43:12 -04:00
parent c34a8b6727
commit d16fdde528
4 changed files with 35 additions and 7 deletions

View file

@ -1232,6 +1232,18 @@ def find_or_create_derived_storage(source, transformation_name, preferred_locati
return new_storage
def delete_derived_storage_by_uuid(storage_uuid):
try:
image_storage = get_storage_by_uuid(storage_uuid)
derived_storage = DerivedImageStorage.get(derivative=image_storage)
except InvalidImageException:
return
except DerivedImageStorage.DoesNotExist:
return
image_storage.delete_instance(recursive=True)
def get_storage_by_uuid(storage_uuid):
placements = list(ImageStoragePlacement
.select(ImageStoragePlacement, ImageStorage, ImageStorageLocation)