netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-11-09 21:51:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

Try to expand exclude_files path when missing

Browse source
This commit is contained in:
deajan 2024-06-16 21:07:43 +02:00
parent bcc94dd42c
commit 438ceaf4b0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
npbackup/restic_wrapper/__init__.py
View file

@ -7,8 +7,8 @@ __intname__ = "npbackup.restic_wrapper"
__author__ = "Orsiris de Jong" __author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2022-2024 NetInvent" __copyright__ = "Copyright (C) 2022-2024 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2024060101" __build__ = "2024061601"
__version__ = "2.2.0" __version__ = "2.2.1"
from typing import Tuple, List, Optional, Callable, Union from typing import Tuple, List, Optional, Callable, Union
@ -25,6 +25,7 @@ from command_runner import command_runner
from ofunctions.misc import BytesConverter, fn_name from ofunctions.misc import BytesConverter, fn_name
from npbackup.__debug__ import _DEBUG from npbackup.__debug__ import _DEBUG
from npbackup.__env__ import FAST_COMMANDS_TIMEOUT, CHECK_INTERVAL from npbackup.__env__ import FAST_COMMANDS_TIMEOUT, CHECK_INTERVAL
from npbackup.path_helper import CURRENT_DIR
logger = getLogger() logger = getLogger()
@ -823,6 +824,11 @@ class ResticRunner:
if exclude_file: if exclude_file:
if os.path.isfile(exclude_file): if os.path.isfile(exclude_file):
cmd += f' --{case_ignore_param}exclude-file "{exclude_file}"' cmd += f' --{case_ignore_param}exclude-file "{exclude_file}"'
elif os.path.isfile(os.path.join(CURRENT_DIR, os.path.basename(exclude_file))):
cmd += f' --{case_ignore_param}exclude-file "{os.path.join(CURRENT_DIR, os.path.basename(exclude_file))}"'
self.write_logs(
f"Expanding exclude file path to {CURRENT_DIR}", level="info"
)
else: else:
self.write_logs( self.write_logs(
f"Exclude file '{exclude_file}' not found", level="error" f"Exclude file '{exclude_file}' not found", level="error"