|
 |
629484 |
commit b98878d0843b8da9c1c963dc855889ec104bb5df
|
|
|
629484 |
Author: Bryn M. Reeves <bmr@redhat.com>
|
|
|
629484 |
Date: Mon Nov 18 13:05:00 2013 +0000
|
|
|
629484 |
|
|
|
629484 |
Revert change to --plugin-options parser action
|
|
|
629484 |
|
|
|
629484 |
Commit 6ea48cb changed the action for the -k/--plugin-option
|
|
|
629484 |
command line argument from 'extend' to 'append'. This breaks the
|
|
|
629484 |
handling of options that are chained with a ',':
|
|
|
629484 |
|
|
|
629484 |
logs.logsize 1,logs.all_logs max size (MiB) to collect per syslog file
|
|
|
629484 |
logs.all_logs off collect all log files defined in syslog.conf
|
|
|
629484 |
|
|
|
629484 |
vs:
|
|
|
629484 |
|
|
|
629484 |
logs.logsize 1 max size (MiB) to collect per syslog file
|
|
|
629484 |
logs.all_logs on collect all log files defined in syslog.conf
|
|
|
629484 |
|
|
|
629484 |
Revert to an 'append' action for this switch.
|
|
|
629484 |
|
|
|
629484 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
629484 |
|
|
|
629484 |
diff --git a/sos/sosreport.py b/sos/sosreport.py
|
|
|
629484 |
index 48bb3af..4ea5f95 100644
|
|
|
629484 |
--- a/sos/sosreport.py
|
|
|
629484 |
+++ b/sos/sosreport.py
|
|
|
629484 |
@@ -477,7 +477,7 @@ class SoSOptions(object):
|
|
|
629484 |
parser.add_option("-o", "--only-plugins", action="extend",
|
|
|
629484 |
dest="onlyplugins", type="string",
|
|
|
629484 |
help="enable these plugins only", default = deque())
|
|
|
629484 |
- parser.add_option("-k", "--plugin-option", action="append",
|
|
|
629484 |
+ parser.add_option("-k", "--plugin-option", action="extend",
|
|
|
629484 |
dest="plugopts", type="string",
|
|
|
629484 |
help="plugin options in plugname.option=value format (see -l)",
|
|
|
629484 |
default = deque())
|