merge from sos-conf branch

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@642 ef72aa8b-4018-0410-8976-d6e080ef94d8

2 files changed, 16 insertions, 4 deletions

diff --git a/src/sos.spec b/src/sos.spec
index 2f2f7dc0..d3571bf8 100644
--- a/src/sos.spec
+++ b/src/sos.spec
@@ -3,7 +3,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 1.8
-Release: 15%{?dist}
+Release: 16%{?dist}
 Group: Applications/System
 Source0: https://fedorahosted.org/releases/s/o/sos/%{name}-%{version}.tar.gz
 License: GPLv2+
@@ -53,8 +53,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %config %{_sysconfdir}/sos.conf
 
 %changelog
-* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-15
+* Tue Sep 9 2009 Adam Stokes <ajs at redhat dot com> = 1.8-16
 - Update rh-upload-core to rh-upload and allows general files
+- Fix cluster plugin with pwd mangling invalidating xml
+- Cluster support detecting invalid fence_id and fence states
+- Read variables from conf file
 
 * Thu Jul 23 2009 Adam Stokes <ajs at redhat dot com> = 1.8-14
 - resolves: rhbz512536 wrong group in spec file
diff --git a/src/sosreport b/src/sosreport
index c2b1580a..59a577cd 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -466,6 +466,13 @@ def sosreport():
     print
     soslog.info ( _("sosreport (version %s)") % __version__)
     print
+    
+    # disable plugins that we read from conf files
+    conf_disable_plugins_list = []
+    if config.has_section("plugins"):
+        conf_disable_plugins = config.get("plugins", "disable").split(',')
+        for item in conf_disable_plugins:
+            conf_disable_plugins_list.append(item.strip())
 
     # generate list of available plugins
     plugins = os.listdir(pluginpath)
@@ -486,7 +493,8 @@ def sosreport():
                 continue
             # plug-in is valid, let's decide whether run it or not
             plugin_names.append(plugbase)
-            if plugbase in __cmdLineOpts__.noplugins:
+            if plugbase in __cmdLineOpts__.noplugins or \
+            plugbase in conf_disable_plugins_list:
                 soslog.log(logging.VERBOSE, _("plugin %s skipped " \
                                               "(--skip-plugins)") % plugbase)
                 skippedplugins.append((plugbase, pluginClass(plugbase, commons)))
@@ -531,7 +539,8 @@ def sosreport():
           __cmdLineOpts__.plugopts = []
 
        for opt, val in config.items("tunables"):
-          __cmdLineOpts__.plugopts.append(opt + "=" + val)
+           if not opt.split('.')[0] in conf_disable_plugins_list:
+               __cmdLineOpts__.plugopts.append(opt + "=" + val)
 
     if __cmdLineOpts__.plugopts:
         opts = {}