From a277d4bcc74ff2def425df72b8611438eeb757ad Mon Sep 17 00:00:00 2001 From: captainwasabi Date: Mon, 12 Aug 2019 06:07:57 -0400 Subject: [PATCH] Write rsync settings before validating I understand the philosophy behind not saving until validated, but there are many examples in software where this is not true. For instance, setting up a mail account in Thunderbird or outlook. You can use the wrong settings on initial setup (indeed, outlook forces you to in some circumstances) then go repair them later. This also solves the second issue I raised in mail-in-a-box#1624 because running backup.py --validate will try to use the new settings, just like the Unkown Error case error message implies it should. --- management/backup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/management/backup.py b/management/backup.py index 93136bf5..0dc1ce60 100755 --- a/management/backup.py +++ b/management/backup.py @@ -473,6 +473,8 @@ def backup_set_custom(env, target, target_user, target_pass, min_age): config["target_pass"] = target_pass config["min_age_in_days"] = min_age + write_backup_config(env, config) + # Validate. try: if config["target"] not in ("off", "local"): @@ -482,8 +484,6 @@ def backup_set_custom(env, target, target_user, target_pass, min_age): except ValueError as e: return str(e) - write_backup_config(env, config) - return "OK" def get_backup_config(env, for_save=False, for_ui=False):