From 0844cd0d4f19e5008735f5b91b625e178356df73 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Mon, 23 Dec 2024 19:53:57 -0800 Subject: [PATCH] Fix the printing of a color reset code at exit even when color is disabled (#956). --- NEWS | 1 + borgmatic/commands/borgmatic.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index af57248d..b838259d 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ * #947: To avoid a hang in the database hooks, error and exit when the borgmatic runtime directory overlaps with the configured excludes. * #954: Fix findmnt command error in the Btrfs hook by switching to parsing JSON output. + * #956: Fix the printing of a color reset code at exit even when color is disabled. * When the ZFS, Btrfs, or LVM hooks aren't configured, don't try to cleanup snapshots for them. 1.9.4 diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 746c06a3..ef05a1b5 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -915,7 +915,10 @@ def main(extra_summary_logs=[]): # pragma: no cover getattr(sub_arguments, 'json', False) for sub_arguments in arguments.values() ) color_enabled = should_do_markup(global_arguments.no_color or any_json_flags, configs) - colorama.init(autoreset=color_enabled, strip=not color_enabled) + + if color_enabled: + colorama.init(autoreset=True) + try: configure_logging( verbosity_to_log_level(global_arguments.verbosity),