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

Fix error on empty replacement values

Browse source
This commit is contained in:
Orsiris de Jong 2023-04-12 08:44:27 +02:00
parent 23b556f03c
commit ba7d6d1981
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
npbackup/configuration.py
View file

@ -7,7 +7,7 @@ __intname__ = "npbackup.configuration"
__author__ = "Orsiris de Jong" __author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2022-2023 NetInvent" __copyright__ = "Copyright (C) 2022-2023 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2023032601" __build__ = "2023041201"
__version__ = "1.7.0 for npbackup 2.2.0+" __version__ = "1.7.0 for npbackup 2.2.0+"
from typing import Tuple, Optional, List from typing import Tuple, Optional, List
@ -252,19 +252,20 @@ def evaluate_variables(config_dict: dict, value: str) -> str:
value = value.replace( value = value.replace(
"${MACHINE_ID}", config_dict["identity"]["machine_id"] "${MACHINE_ID}", config_dict["identity"]["machine_id"]
) )
except KeyError: # TypeError may happen if config_dict[x][y] is None
except (KeyError, TypeError):
pass pass
try: try:
value = value.replace( value = value.replace(
"${MACHINE_GROUP}", config_dict["identity"]["machine_group"] "${MACHINE_GROUP}", config_dict["identity"]["machine_group"]
) )
except KeyError: except (KeyError, TypeError):
pass pass
try: try:
value = value.replace( value = value.replace(
"${BACKUP_JOB}", config_dict["prometheus"]["backup_job"] "${BACKUP_JOB}", config_dict["prometheus"]["backup_job"]
) )
except KeyError: except (KeyError, TypeError):
pass pass
return value return value