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

Added variable/user expansion for additional parameters, see #123

Browse source
This commit is contained in:
deajan 2025-02-12 11:40:45 +01:00
parent 1ef23546ea
commit 08b09932a4
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
npbackup/core/runner.py
View file

@ -827,6 +827,11 @@ class NPBackupRunner:
self.restic_runner.additional_parameters = self.repo_config.g( self.restic_runner.additional_parameters = self.repo_config.g(
"backup_opts.additional_parameters" "backup_opts.additional_parameters"
) )
try:
self.restic_runner.additional_parameters = os.path.expanduser(self.restic_runner.additional_parameters)
self.restic_runner.additional_parameters = os.path.expandvars(self.restic_runner.additional_parameters)
except OSError:
self.write_logs(f"Failed expansion for additional parameters: {self.restic_runner.additional_parameters}", level="error")
except KeyError: except KeyError:
pass pass
except ValueError: except ValueError:
@ -1189,9 +1194,21 @@ class NPBackupRunner:
except KeyError: except KeyError:
tags = None tags = None
additional_backup_only_parameters = self.repo_config.g( additional_backup_only_parameters = None
"backup_opts.additional_backup_only_parameters" try:
) if self.repo_config.g("backup_opts.additional_backup_only_parameters"):
additional_backup_only_parameters = self.repo_config.g(
"backup_opts.additional_backup_only_parameters"
)
try:
additional_backup_only_parameters = os.path.expanduser(additional_backup_only_parameters)
additional_backup_only_parameters = os.path.expandvars(additional_backup_only_parameters)
except OSError:
self.write_logs(f"Failed expansion for additional backup parameters: {additional_backup_only_parameters}", level="error")
except KeyError:
pass
except ValueError:
self.write_logs("Bogus additional backup parameters given", level="warning")
if not force: 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 # Check if backup is required, no need to be verbose, but we'll make sure we don't get a json result here