diff options
| author | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-08-03 10:27:37 +0000 |
|---|---|---|
| committer | shnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8> | 2007-08-03 10:27:37 +0000 |
| commit | b2ed24d1023f094deb7ce54ab59ca4384db646a5 (patch) | |
| tree | 55af6568e96497345004f19bb330e1eb7baa06ed /src/sosreport | |
| parent | b469def0940d7bdccc04d6372d7fdf8b565d5a08 (diff) | |
| download | sos-b2ed24d1023f094deb7ce54ab59ca4384db646a5.tar.gz | |
version bumped to 1.7-6pre0
fixed gettext messages
moved policy.preWork() after plugins.diagnose()
cluster diagnose better messages
yum diagnose() disabled for now
fixed gettext stuff in Makefile
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@326 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src/sosreport')
| -rwxr-xr-x | src/sosreport | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sosreport b/src/sosreport index 302373ae..76fc8206 100755 --- a/src/sosreport +++ b/src/sosreport @@ -374,6 +374,8 @@ def sosreport(): plugins = os.listdir(pluginpath) plugins.sort() + # FIXME: should at least print a warning if the user references a plugin which does not exist + # validate and load plugins for plug in plugins: plugbase = plug[:-3] @@ -389,7 +391,7 @@ def sosreport(): skippedplugins.append((plugbase, pluginClass(plugbase, commons))) continue if plugbase in __cmdLineOpts__.noplugins: - soslog.log(logging.VERBOSE, _("plug %s skipped (--skip-plugins)") % plugbase) + soslog.log(logging.VERBOSE, _("plugin %s skipped (--skip-plugins)") % plugbase) skippedplugins.append((plugbase, pluginClass(plugbase, commons))) continue if not pluginClass(plugbase, commons).checkenabled() and not plugbase in __cmdLineOpts__.enableplugins and not plugbase in __cmdLineOpts__.onlyplugins: @@ -539,8 +541,6 @@ Press ENTER to continue, or CTRL-C to quit. print sys.exit(0) - policy.preWork() - # Call the diagnose() method for each plugin tmpcount = 0 for plugname, plug in loadedplugins: @@ -579,6 +579,8 @@ Press ENTER to continue, or CTRL-C to quit. print sys.exit(0) + policy.preWork() + # Call the setup() method for each plugin for plugname, plug in loadedplugins: soslog.log(logging.VERBOSE2, "Preloading files and commands to be gathered by plugin %s" % plugname) |