commit 120d751cb8117cf3b593e536803fc22ce1676b64 Author: Damian Johnson atagar@torproject.org Date: Sun Sep 7 15:06:35 2014 -0700
Exception when running 'run_arm --help'
Stacktrace due to having two 'config' attributes.
Traceback (most recent call last): File "./run_arm", line 47, in <module> main() File "./run_arm", line 16, in main arm.starter.main() File "/home/atagar/Desktop/arm/stem/util/conf.py", line 288, in wrapped return func(*args, config = config, **kwargs) File "/home/atagar/Desktop/arm/arm/starter.py", line 43, in main print arm.arguments.get_help() File "/home/atagar/Desktop/arm/arm/arguments.py", line 142, in get_help event_flags = msg('misc.event_types'), File "/home/atagar/Desktop/arm/stem/util/conf.py", line 288, in wrapped return func(*args, config = config, **kwargs) TypeError: msg() got multiple values for keyword argument 'config' --- arm/arguments.py | 2 +- arm/config/strings.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arm/arguments.py b/arm/arguments.py index 136971e..d7820dd 100644 --- a/arm/arguments.py +++ b/arm/arguments.py @@ -137,7 +137,7 @@ def get_help(): address = DEFAULT_ARGS['control_address'], port = DEFAULT_ARGS['control_port'], socket = DEFAULT_ARGS['control_socket'], - config = DEFAULT_ARGS['config'], + config_path = DEFAULT_ARGS['config'], events = DEFAULT_ARGS['logged_events'], event_flags = msg('misc.event_types'), ) diff --git a/arm/config/strings.cfg b/arm/config/strings.cfg index 25970d0..f20d277 100644 --- a/arm/config/strings.cfg +++ b/arm/config/strings.cfg @@ -76,7 +76,7 @@ msg.usage.help_output | -s, --socket SOCKET_PATH attach using unix domain socket if present, | SOCKET_PATH defaults to: {socket} | -c, --config CONFIG_PATH loaded configuration options, CONFIG_PATH -| defaults to: {config} +| defaults to: {config_path} | -d, --debug LOG_PATH writes all arm logs to the given location | -l, --log EVENT_FLAGS event types to be logged (default: {events}) |{event_flags}