Since @transaction rolls back exceptions, don't use exception-based inserts.

2017-05-01 21:26:07 -07:00 · 2017-05-01 21:26:07 -07:00 · fbf73ac515
commit fbf73ac515
parent a9c7ad6993
1 changed files with 2 additions and 2 deletions
--- a/etiquette/photodb.py
+++ b/etiquette/photodb.py
@ -1254,9 +1254,9 @@ class PhotoDB(PDBAlbumMixin, PDBBookmarkMixin, PDBPhotoMixin, PDBTagMixin, PDBUs
            new_photos = []
            for filepath in files:
                try:
+                    photo = self.get_photo_by_path(filepath)
+                except exceptions.NoSuchPhoto:
                    photo = self.new_photo(filepath.absolute_path, commit=False)
-                except exceptions.PhotoExists as e:
-                    photo = e.photo
                new_photos.append(photo)

            if not make_albums: