commit b98878d0843b8da9c1c963dc855889ec104bb5df Author: Bryn M. Reeves Date: Mon Nov 18 13:05:00 2013 +0000 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 diff --git a/sos/sosreport.py b/sos/sosreport.py index 48bb3af..4ea5f95 100644 --- a/sos/sosreport.py +++ b/sos/sosreport.py @@ -477,7 +477,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())