Since @transaction rolls back exceptions, don't use exception-based inserts.
This commit is contained in:
		
							parent
							
								
									a9c7ad6993
								
							
						
					
					
						commit
						fbf73ac515
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		|  | @ -1254,9 +1254,9 @@ class PhotoDB(PDBAlbumMixin, PDBBookmarkMixin, PDBPhotoMixin, PDBTagMixin, PDBUs | ||||||
|             new_photos = [] |             new_photos = [] | ||||||
|             for filepath in files: |             for filepath in files: | ||||||
|                 try: |                 try: | ||||||
|  |                     photo = self.get_photo_by_path(filepath) | ||||||
|  |                 except exceptions.NoSuchPhoto: | ||||||
|                     photo = self.new_photo(filepath.absolute_path, commit=False) |                     photo = self.new_photo(filepath.absolute_path, commit=False) | ||||||
|                 except exceptions.PhotoExists as e: |  | ||||||
|                     photo = e.photo |  | ||||||
|                 new_photos.append(photo) |                 new_photos.append(photo) | ||||||
| 
 | 
 | ||||||
|             if not make_albums: |             if not make_albums: | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue