Fix broken pass-through of BORG_* environment variables to Borg (#327).

Reviewed-on: https://projects.torsion.org/witten/borgmatic/pulls/327
This commit is contained in:
Dan Helfman 2020-06-21 21:29:59 +00:00
commit c8d5de2179

View file

@ -19,7 +19,8 @@ DEFAULT_BOOL_OPTION_TO_ENVIRONMENT_VARIABLE = {
def initialize(storage_config): def initialize(storage_config):
for option_name, environment_variable_name in OPTION_TO_ENVIRONMENT_VARIABLE.items(): for option_name, environment_variable_name in OPTION_TO_ENVIRONMENT_VARIABLE.items():
value = storage_config.get(option_name) # Options from the config.yaml file have precedence over already set env variables:
value = storage_config.get(option_name) or os.environ.get(environment_variable_name)
if value: if value:
os.environ[environment_variable_name] = value os.environ[environment_variable_name] = value
else: else: