Merge branch 'main' into same-named-databases

This commit is contained in:
Dan Helfman 2024-12-24 15:25:57 -08:00
commit b58a52e03f
2 changed files with 5 additions and 1 deletions

1
NEWS
View file

@ -4,6 +4,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 a findmnt command error in the Btrfs hook by switching to parsing JSON output.
* #956: Fix the printing of a color reset code 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

View file

@ -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),