From 172a2b9b98a607a5e2e7ef05b6f4f7a590dc9cf2 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 12 Apr 2015 14:48:29 +0200 Subject: [PATCH] Abort if VDIRSYNCER_CONFIG is invalid Fix #193 --- vdirsyncer/cli/utils.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/vdirsyncer/cli/utils.py b/vdirsyncer/cli/utils.py index 09fb92e..22cb62c 100644 --- a/vdirsyncer/cli/utils.py +++ b/vdirsyncer/cli/utils.py @@ -292,12 +292,14 @@ def _validate_pair_section(pair_config): def load_config(): - fname = expand_path(os.environ.get('VDIRSYNCER_CONFIG', - '~/.vdirsyncer/config')) - if not os.path.exists(fname): - xdg_config_dir = os.environ.get('XDG_CONFIG_HOME', - expand_path('~/.config/')) - fname = os.path.join(xdg_config_dir, 'vdirsyncer/config') + fname = os.environ.get('VDIRSYNCER_CONFIG', None) + if not fname: + fname = expand_path('~/.vdirsyncer/config') + if not os.path.exists(fname): + xdg_config_dir = os.environ.get('XDG_CONFIG_HOME', + expand_path('~/.config/')) + fname = os.path.join(xdg_config_dir, 'vdirsyncer/config') + try: with open(fname) as f: general, pairs, storages = read_config(f)