aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-01-12 19:06:13 +0000
committersconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-01-12 19:06:13 +0000
commit0f7853642d1c3648f41ea818d87ce527114f02c8 (patch)
tree43c4e70f0aed7c7ceafb60a217b68742ca2bce5e /src
parentbf96c8a2912971b243f8d3dc223b040567fc93ef (diff)
downloadsos-0f7853642d1c3648f41ea818d87ce527114f02c8.tar.gz
Fixed a problem if when no plugins specified to be skipped.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@66 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sosreport8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sosreport b/src/sosreport
index 5f7d5cf8..1acbc681 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -44,7 +44,7 @@ __raisePlugins__ = 1
__cmdParser__ = OptionParser()
__cmdParser__.add_option("-a", "--alloptions", action="store_true", \
- dest="alloptions", default=False, \
+ dest="usealloptions", default=False, \
help="Use all options for loaded plugins")
__cmdParser__.add_option("-f", "--fastoptions", action="store_true", \
dest="fastoptions", default=False, \
@@ -70,7 +70,7 @@ def get_curse_options(alloptions):
"""
use curses to enable the user to select some options
"""
- # allooptions is an array of (plug, plugname, optname, parms(dictionary)) tuples
+ # alloptions is an array of (plug, plugname, optname, parms(dictionary)) tuples
plugName = []
out = []
@@ -173,7 +173,7 @@ def sosreport():
sys.exit()
for plug in plugins:
- if ((plug[-3:] == '.py') and (plug != "__init__.py") and (plug[:-3] not in __cmdLineOpts__.noplugins) ):
+ if ((plug[-3:] == '.py') and (plug != "__init__.py") and (not __cmdLineOpts__.noplugins or (plug[:-3] not in __cmdLineOpts__.noplugins)) ):
try:
plugbase = plug[:-3]
pidot = "sos.plugins." + plugbase
@@ -210,7 +210,7 @@ def sosreport():
for optname, optparm in zip(names, parms):
alloptions.append((plug, plugname, optname, optparm))
- if not __cmdLineOpts__.fastoptions and not __cmdLineOpts__.alloptions:
+ if not __cmdLineOpts__.fastoptions and not __cmdLineOpts__.usealloptions:
get_curse_options(alloptions)
elif __cmdLineOpts__.fastoptions:
for i in range(len(alloptions)):