external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-23 02:27:05 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into patch-2

Browse Source
This commit is contained in:
captainwasabi 2019-08-12 12:24:02 -04:00 committed by GitHub
commit 9ee7bbf78a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
management/backup.py
View File

@ -406,7 +406,7 @@ def list_target_files(config):
reason = "Provided path {} is invalid.".format(target_path) reason = "Provided path {} is invalid.".format(target_path)
elif 'Network is unreachable' in listing: elif 'Network is unreachable' in listing:
reason = "The IP address {} is unreachable.".format(target.hostname) reason = "The IP address {} is unreachable.".format(target.hostname)
elif 'Could not resolve hostname': elif 'Could not resolve hostname' in listing:
reason = "The hostname {} cannot be resolved.".format(target.hostname) reason = "The hostname {} cannot be resolved.".format(target.hostname)
else: else:
reason = "Unknown error." \ reason = "Unknown error." \
@ -473,7 +473,7 @@ def backup_set_custom(env, target, target_user, target_pass, min_age):
config["target_pass"] = target_pass config["target_pass"] = target_pass
config["min_age_in_days"] = min_age config["min_age_in_days"] = min_age
write_backup_config(env, config) write_backup_config(env, config)
# Validate. # Validate.
try: try: