From 63e4f8cea38fdde5dbc1fe582b0307ad59370f81 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 5 Jun 2018 11:12:03 +0200 Subject: Fail silently when image is not available on document save --- ishtar_common/models.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index f3fda4e60..bdc621528 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -3258,12 +3258,16 @@ class IshtarImage(ImageModel): reference_path = self._get_available_filename( reference_path) - - os.rename(initial_path, reference_path) - os.rename(self.thumbnail.path, - self._get_thumb_name(reference_path)) - self.image.name = reference_path[len(settings.MEDIA_ROOT):] - self.save(no_path_change=True) + try: + os.rename(initial_path, reference_path) + os.rename(self.thumbnail.path, + self._get_thumb_name(reference_path)) + self.image.name = reference_path[ + len(settings.MEDIA_ROOT):] + self.save(no_path_change=True) + except OSError: + # file probably not on harddrive - will be cleaned + pass continue # create a link new_path = settings.MEDIA_ROOT + new_path -- cgit v1.2.3