Merge branch 'bwq-datadir_option' into develop

This commit is contained in:
Ruud committed 2012-06-23 22:32:36 +02:00
commit 2d05aafc04
2 files changed
+8 -1

No files matched your search

+2
View File
@@ -26,6 +26,8 @@ def getOptions(base_path, args):
parser = ArgumentParser(prog = 'CouchPotato.py')
parser.add_argument('--config_file', default = os.path.join(data_dir, 'settings.conf'),
dest = 'config_file', help = 'Absolute or ~/ path of the settings file (default ./_data/settings.conf)')
parser.add_argument('--data_dir', default = data_dir,
dest = 'data_dir', help = 'Absolute or ~/ path of the data dir')
parser.add_argument('--debug', action = 'store_true',
dest = 'debug', help = 'Debug mode')
parser.add_argument('--console_log', action = 'store_true',