From ef28a1defd7720a41856d87c7e4f595f7c910732 Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Fri, 30 Nov 2018 10:26:49 -0500 Subject: [PATCH] show the Mail-in-a-Box version in the system status checks even when the new-version check is disabled fixes #922 --- CHANGELOG.md | 1 + management/status_checks.py | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ddf299b..5fc22a69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Control Panel: * The users page now documents that passwords should only have ASCII characters to prevent character encoding mismaches between clients and the server. * The users page no longer shows user mailbox sizes because this was extremely slow for very large mailboxes. +* The Mail-in-a-Box version is now shown in the system status checks even when the new-version check is disabled. v0.29 (October 25, 2018) ------------------------ diff --git a/management/status_checks.py b/management/status_checks.py index 3b0026d9..86cfe33f 100755 --- a/management/status_checks.py +++ b/management/status_checks.py @@ -795,14 +795,14 @@ def get_latest_miab_version(): def check_miab_version(env, output): config = load_settings(env) - if config.get("privacy", True): - output.print_warning("Mail-in-a-Box version check disabled by privacy setting.") - else: - try: - this_ver = what_version_is_this(env) - except: - this_ver = "Unknown" + try: + this_ver = what_version_is_this(env) + except: + this_ver = "Unknown" + if config.get("privacy", True): + output.print_warning("You are running version Mail-in-a-Box %s. Mail-in-a-Box version check disabled by privacy setting." % this_ver) + else: latest_ver = get_latest_miab_version() if this_ver == latest_ver: