From 6ae397126b6e049dac6c1f1ec10c387b9f936529 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 6 Jul 2017 20:37:04 +0530 Subject: [PATCH] Retry rename of imported config directory In case an AV program has locked the imported config directory on Windows, sigh. --- src/calibre/utils/exim.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/exim.py b/src/calibre/utils/exim.py index 27e27321f3..50f4ed9842 100644 --- a/src/calibre/utils/exim.py +++ b/src/calibre/utils/exim.py @@ -357,7 +357,11 @@ def import_data(importer, library_path_map, config_location=None, progress1=None raise time.sleep(1) shutil.rmtree(config_location) - os.rename(base_dir, config_location) + try: + os.rename(base_dir, config_location) + except EnvironmentError: + time.sleep(2) + os.rename(base_dir, config_location) from calibre.gui2 import gprefs gprefs.refresh() @@ -420,5 +424,6 @@ def run_importer(): # }}} + if __name__ == '__main__': export(sys.argv[-1], progress1=print, progress2=print)