tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load no config file for --config without argument

Browse Source
This commit is contained in:
Unrud 2021-12-24 18:13:18 +01:00
parent f75671354c
commit 4564de9f9d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS.md
View File

@ -13,7 +13,7 @@
* Disallow abbreviated arguments * Disallow abbreviated arguments
* Support backend specific options and HTTP headers * Support backend specific options and HTTP headers
* Optional argument for boolean options * Optional argument for boolean options
* Require argument for `--config` * Load no config file for `--config` without argument
* Allow float for server->timeout setting * Allow float for server->timeout setting
* Fix **is-not-defined** filter in **addressbook-query** report * Fix **is-not-defined** filter in **addressbook-query** report
* Add python type hints * Add python type hints

3
radicale/__main__.py
View File

@ -155,7 +155,8 @@ def run() -> None:
configuration = config.load(config.parse_compound_paths( configuration = config.load(config.parse_compound_paths(
config.DEFAULT_CONFIG_PATH, config.DEFAULT_CONFIG_PATH,
os.environ.get("RADICALE_CONFIG"), os.environ.get("RADICALE_CONFIG"),
os.pathsep.join(args_ns.config) if args_ns.config else None)) os.pathsep.join(args_ns.config) if args_ns.config is not None
else None))
if arguments_config: if arguments_config:
configuration.update(arguments_config, "command line arguments") configuration.update(arguments_config, "command line arguments")
except Exception as e: except Exception as e: