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

Don't check for recent backup if --force is goven

Browse source
This commit is contained in:
deajan 2024-06-11 22:18:50 +02:00
parent 729a2a7c1f
commit c0c3cb78b4
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
npbackup/core/runner.py
View file

@ -1076,23 +1076,24 @@ class NPBackupRunner:
"backup_opts.additional_backup_only_parameters"
)
# Check if backup is required, no need to be verbose, but we'll make sure we don't get a json result here
self.restic_runner.verbose = False
json_output = self.json_output
self.json_output = False
# Since we don't want to close queues nor create a subthread, we need to change behavior here
# pylint: disable=E1123 (unexpected-keyword-arg)
has_recent_snapshots, backup_tz = self.has_recent_snapshot(
__close_queues=False, __no_threads=True
)
self.json_output = json_output
# We also need to "reapply" the json setting to backend
self.restic_runner.json_output = json_output
if has_recent_snapshots and not force:
msg = "No backup necessary"
self.write_logs(msg, level="info")
return self.convert_to_json_output(True, msg)
self.restic_runner.verbose = self.verbose
if not force:
# Check if backup is required, no need to be verbose, but we'll make sure we don't get a json result here
self.restic_runner.verbose = False
json_output = self.json_output
self.json_output = False
# Since we don't want to close queues nor create a subthread, we need to change behavior here
# pylint: disable=E1123 (unexpected-keyword-arg)
has_recent_snapshots, _ = self.has_recent_snapshot(
__close_queues=False, __no_threads=True
)
self.json_output = json_output
# We also need to "reapply" the json setting to backend
self.restic_runner.json_output = json_output
if has_recent_snapshots:
msg = "No backup necessary"
self.write_logs(msg, level="info")
return self.convert_to_json_output(True, msg)
self.restic_runner.verbose = self.verbose
# Run backup here
if not read_from_stdin: