From 310535f2b35e8e1a93e56fe797848a09eee9b00c Mon Sep 17 00:00:00 2001 From: Lertsenem Date: Wed, 16 Sep 2015 18:53:23 +0200 Subject: [PATCH] Code factorisation --- persoconf/main.py | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/persoconf/main.py b/persoconf/main.py index 546bf25..afd5953 100755 --- a/persoconf/main.py +++ b/persoconf/main.py @@ -147,30 +147,7 @@ def copy_file_or_directory(logger, path_dst, path_src, overwrite=True): # Everything went well, time to remove the backup # -------------------------------------- if overwrite: - # As before, try it as a dir first - try: - logger.info("Removing backup directory %s" % (dst + ".bak")) - shutil.rmtree(dst + ".bak") - - except FileNotFoundError: - logger.warning("Backup file %s seems to be already gone" - % (dst + ".bak")) - except PermissionError: - logger.warning("Cannot remove backup dir %s, you will have to " \ - "do it manually" - % (dst + ".bak")) - - # If not, try it as a file - except NotADirectoryError: - try: - logger.info("Removing backup file %s" % (dst + ".bak")) - os.remove(dst + ".bak") - - except PermissionError: - logger.warning("Cannot remove backup file %s, you will have " \ - "to do it manually" - % (dst + ".bak")) - + delete_file_or_dir((dst + ".bak"), logger) # The End. return True