From 10738acbd23db7a2612e8a8aa6829cc7e85b711d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 10 Dec 2015 10:16:46 +0530 Subject: [PATCH] Report delete failures during library mode to stdout --- src/calibre/db/backend.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py index 21e360b68a..924bbafe52 100644 --- a/src/calibre/db/backend.py +++ b/src/calibre/db/backend.py @@ -13,7 +13,7 @@ from functools import partial 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, preferred_encoding) from calibre.ptempfile import PersistentTemporaryFile, TemporaryFile @@ -1704,13 +1704,15 @@ class DB(object): for loc in old_dirs: try: shutil.rmtree(loc) - except EnvironmentError: - pass + except EnvironmentError as e: + if os.path.exists(loc): + prints('Failed to delete:', loc, 'with error:', as_unicode(e)) for loc in old_files: try: os.remove(loc) - except EnvironmentError: - pass + except EnvironmentError as e: + if e.errno != errno.ENOENT: + prints('Failed to delete:', loc, 'with error:', as_unicode(e)) try: os.rmdir(odir) except EnvironmentError: