Prechádzať zdrojové kódy

After a backup of a database dump in directory format, properly remove the dump directory.

Dan Helfman 5 rokov pred
rodič
commit
8ef0ba2fae
1 zmenil súbory, kde vykonal 5 pridanie a 1 odobranie
  1. 5 1
      borgmatic/hooks/dump.py

+ 5 - 1
borgmatic/hooks/dump.py

@@ -1,6 +1,7 @@
 import glob
 import logging
 import os
+import shutil
 
 from borgmatic.borg.create import DEFAULT_BORGMATIC_SOURCE_DIRECTORY
 
@@ -83,7 +84,10 @@ def remove_database_dumps(dump_path, databases, database_type_name, log_prefix,
         if dry_run:
             continue
 
-        os.remove(dump_filename)
+        if os.path.isdir(dump_filename):
+            shutil.rmtree(dump_filename)
+        else:
+            os.remove(dump_filename)
         dump_file_dir = os.path.dirname(dump_filename)
 
         if len(os.listdir(dump_file_dir)) == 0: