Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix exception not being re-raised when deleting book fails

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-21 09:23:54 +05:30
parent acaee61715
commit d8967eae75
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/actions/delete.py
View File

@ -5,7 +5,7 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import errno import errno, os
from functools import partial from functools import partial
from collections import Counter from collections import Counter
@ -379,12 +379,12 @@ class DeleteAction(InterfaceAction):
except IOError as err: except IOError as err:
if err.errno == errno.EACCES: if err.errno == errno.EACCES:
import traceback import traceback
fname = getattr(err, 'filename', 'file') or 'file' fname = os.path.basename(getattr(err, 'filename', 'file') or 'file')
return error_dialog(self.gui, _('Permission denied'), return error_dialog(self.gui, _('Permission denied'),
_('Could not access %s. Is it being used by another' _('Could not access %s. Is it being used by another'
' program? Click "Show details" for more information.')%fname, det_msg=traceback.format_exc(), ' program? Click "Show details" for more information.')%fname, det_msg=traceback.format_exc(),
show=True) show=True)
raise
self.library_ids_deleted2(to_delete_ids, next_id=next_id) self.library_ids_deleted2(to_delete_ids, next_id=next_id)
else: else:
self.__md = MultiDeleter(self.gui, to_delete_ids, self.__md = MultiDeleter(self.gui, to_delete_ids,