Add a --config-file option.

pimutils · Apr 7, 2016 · 4f8ed93 · 4f8ed93
1 parent 69b88dd
commit 4f8ed93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/vdirsyncer/cli/__init__.py b/vdirsyncer/cli/__init__.py
@@ -50,17 +50,18 @@ def _check_python2():
 @click_log.init('vdirsyncer')
 @click_log.simple_verbosity_option()
 @click.version_option(version=__version__)
+@click.option('--config', '-c', metavar='FILE', help='Config file to use.')
 @pass_context
 @catch_errors
-def app(ctx):
+def app(ctx, config):
     '''
     vdirsyncer -- synchronize calendars and contacts
     '''
     _check_python2()
     from .config import load_config
 
     if not ctx.config:
-        ctx.config = load_config()
+        ctx.config = load_config(config)
 
 main = app
 

diff --git a/vdirsyncer/cli/config.py b/vdirsyncer/cli/config.py
@@ -79,9 +79,10 @@ def _validate_pair_section(pair_config):
         raise ValueError('Duplicate values in collections parameter.')
 
 
-def load_config():
-    fname = os.environ.get('VDIRSYNCER_CONFIG', None)
-    if not fname:
+def load_config(fname=None):
+    if fname is None:
+        fname = os.environ.get('VDIRSYNCER_CONFIG', None)
+    if fname is None:
         fname = expand_path('~/.vdirsyncer/config')
         if not os.path.exists(fname):
             xdg_config_dir = os.environ.get('XDG_CONFIG_HOME',