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

Report delete failures during library mode to stdout

Browse Source
This commit is contained in:
Kovid Goyal 2015-12-10 10:16:46 +05:30
parent 022b011889
commit 10738acbd2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/db/backend.py
View File

@ -13,7 +13,7 @@ from functools import partial
import apsw import apsw
from calibre import isbytestring, force_unicode, prints from calibre import isbytestring, force_unicode, prints, as_unicode
from calibre.constants import (iswindows, filesystem_encoding, from calibre.constants import (iswindows, filesystem_encoding,
preferred_encoding) preferred_encoding)
from calibre.ptempfile import PersistentTemporaryFile, TemporaryFile from calibre.ptempfile import PersistentTemporaryFile, TemporaryFile
@ -1704,13 +1704,15 @@ class DB(object):
for loc in old_dirs: for loc in old_dirs:
try: try:
shutil.rmtree(loc) shutil.rmtree(loc)
except EnvironmentError: except EnvironmentError as e:
pass if os.path.exists(loc):
prints('Failed to delete:', loc, 'with error:', as_unicode(e))
for loc in old_files: for loc in old_files:
try: try:
os.remove(loc) os.remove(loc)
except EnvironmentError: except EnvironmentError as e:
pass if e.errno != errno.ENOENT:
prints('Failed to delete:', loc, 'with error:', as_unicode(e))
try: try:
os.rmdir(odir) os.rmdir(odir)
except EnvironmentError: except EnvironmentError: