From 10b67f482494fa206ca11f77fa1732ba99099a7e Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 21 Apr 2022 14:21:00 -0300 Subject: [PATCH] Fixed problems with compress.move_files - When trying to remove directories Fixes #192 --- kibot/out_compress.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/kibot/out_compress.py b/kibot/out_compress.py index 42d20450..59fe57f4 100644 --- a/kibot/out_compress.py +++ b/kibot/out_compress.py @@ -191,9 +191,22 @@ class CompressOptions(BaseOptions): elif self.format == 'RAR': self.create_rar(output, files) if self.move_files: + dirs = [] for fname in files.keys(): - logger.debug('Removing '+fname) - os.remove(fname) + if os.path.isfile(fname): + os.remove(fname) + logger.debug('Removing '+fname) + elif os.path.isdir(fname): + dirs.append(fname) + for d in sorted(dirs, key=lambda x: len(x.split(os.sep)), reverse=True): + logger.debug('Removing '+d) + try: + os.rmdir(d) + except OSError as e: + if e.errno == 39: + logger.debug(' Not empty') + else: + raise @output_class