aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2015-01-27 15:18:27 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2015-01-27 15:18:27 +0100
commit54c68be7fd20b279aec540778b57e9a017571afa (patch)
tree761ed72a35264995e386da19e7406acab2d92e58
parentDon't deal with invalid unicode (diff)
downloadPhotoFloat-54c68be7fd20b279aec540778b57e9a017571afa.tar.xz
PhotoFloat-54c68be7fd20b279aec540778b57e9a017571afa.zip
Don't crash when unable to unlink
-rw-r--r--scanner/PhotoAlbum.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/scanner/PhotoAlbum.py b/scanner/PhotoAlbum.py
index 8e09554..437687e 100644
--- a/scanner/PhotoAlbum.py
+++ b/scanner/PhotoAlbum.py
@@ -262,11 +262,17 @@ class Photo(object):
try:
image.save(thumb_path, "JPEG", quality=88)
except KeyboardInterrupt:
- os.unlink(thumb_path)
+ try:
+ os.unlink(thumb_path)
+ except:
+ pass
raise
except:
message("save failure", os.path.basename(thumb_path))
- os.unlink(thumb_path)
+ try:
+ os.unlink(thumb_path)
+ except:
+ pass
def _thumbnails(self, image, thumb_path, original_path):
mirror = image