psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support directory format dump cleanup.

Browse source 
Previously, only deleting a dump in a single-file format was supported.
This led to errors when performing a PostgreSQL directory format backup.
This commit is contained in:
Ronan Dunklau 2020-01-19 15:15:47 +01:00
parent 5afe0e3d63
commit 8a91c79fb0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
borgmatic/hooks/dump.py
View file

@ -1,6 +1,7 @@
import glob import glob
import logging import logging
import os import os
import shutil
from borgmatic.borg.create import DEFAULT_BORGMATIC_SOURCE_DIRECTORY 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: if dry_run:
continue 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) dump_file_dir = os.path.dirname(dump_filename)
if len(os.listdir(dump_file_dir)) == 0: if len(os.listdir(dump_file_dir)) == 0: