Merge "Fix exception in image cleanup"
This commit is contained in:
@@ -430,6 +430,11 @@ class CleanupWorker(BaseWorker):
|
|||||||
'''
|
'''
|
||||||
images_dir = self._config.images_dir
|
images_dir = self._config.images_dir
|
||||||
diskimage = self._config.diskimages.get(image_name)
|
diskimage = self._config.diskimages.get(image_name)
|
||||||
|
|
||||||
|
# If the diskimage is not in the config, it can be deleted.
|
||||||
|
if not diskimage:
|
||||||
|
to_keep = set()
|
||||||
|
else:
|
||||||
if not diskimage.delete_after_upload:
|
if not diskimage.delete_after_upload:
|
||||||
return
|
return
|
||||||
to_keep = set(diskimage.keep_image_types)
|
to_keep = set(diskimage.keep_image_types)
|
||||||
|
Reference in New Issue
Block a user