From 34e0eafc6ad0b09b7bc9db4f3272547020eb03cc Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Mon, 18 Nov 2013 13:05:00 +0000 Subject: Revert change to --plugin-options parser action Commit 6ea48cb changed the action for the -k/--plugin-option command line argument from 'extend' to 'append'. This breaks the handling of options that are chained with a ',': logs.logsize 1,logs.all_logs max size (MiB) to collect per syslog file logs.all_logs off collect all log files defined in syslog.conf vs: logs.logsize 1 max size (MiB) to collect per syslog file logs.all_logs on collect all log files defined in syslog.conf Revert to an 'append' action for this switch. Signed-off-by: Bryn M. Reeves --- sos/sosreport.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sos/sosreport.py b/sos/sosreport.py index b97dde91..1eb0918b 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -485,7 +485,7 @@ class SoSOptions(object): parser.add_option("-o", "--only-plugins", action="extend", dest="onlyplugins", type="string", help="enable these plugins only", default = deque()) - parser.add_option("-k", "--plugin-option", action="append", + parser.add_option("-k", "--plugin-option", action="extend", dest="plugopts", type="string", help="plugin options in plugname.option=value format (see -l)", default = deque()) -- cgit