From dede8f9d4b9aea39b81f98d516d60ce236ebb5d6 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sun, 17 Jun 2018 14:30:47 -0700 Subject: [PATCH] News for: ~/.config/borgmatic/config.yaml. --- NEWS | 1 + borgmatic/config/collect.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 78e25fab7..2e9bdadd3 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ * #63: Support for Borg --nobsdflags option to skip recording bsdflags (e.g. NODUMP, IMMUTABLE) in archive. * Update tox.ini to only assume Python 3.x instead of Python 3.4 specifically. + * Add ~/.config/borgmatic/config.yaml to default configuration path probing. 1.1.15 * Support for Borg BORG_PASSCOMMAND environment variable to read a password from an external file. diff --git a/borgmatic/config/collect.py b/borgmatic/config/collect.py index 71e0c45ca..02ccc9dc5 100644 --- a/borgmatic/config/collect.py +++ b/borgmatic/config/collect.py @@ -1,8 +1,11 @@ import os -DEFAULT_CONFIG_PATHS = ['/etc/borgmatic/config.yaml', '/etc/borgmatic.d', - os.path.expanduser('~/.config/borgmatic/config.yaml')] +DEFAULT_CONFIG_PATHS = [ + '/etc/borgmatic/config.yaml', + '/etc/borgmatic.d', + os.path.expanduser('~/.config/borgmatic/config.yaml'), +] def collect_config_filenames(config_paths):