From 42272212d47a76322e1523985f4306b65cd5745f Mon Sep 17 00:00:00 2001
From: sconklin <sconklin@ef72aa8b-4018-0410-8976-d6e080ef94d8>
Date: Thu, 7 Sep 2006 19:12:28 +0000
Subject: Added alerts for tainted kernel and some well-known tainting modules.
 Moved verbosity from a parameter to the global info list.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@52 ef72aa8b-4018-0410-8976-d6e080ef94d8
---
 src/sosreport | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/sosreport')

diff --git a/src/sosreport b/src/sosreport
index a842f3ee..998f3653 100755
--- a/src/sosreport
+++ b/src/sosreport
@@ -149,7 +149,8 @@ def sosreport():
     logfd = open(logdir + "/sos.log", "w")
 
     # set up dict so everyone can share the following
-    commons = {'dstroot': dstroot, 'cmddir': cmddir, 'logdir': logdir, 'rptdir': rptdir, 'logfd': logfd, 'policy': policy}
+    commons = {'dstroot': dstroot, 'cmddir': cmddir, 'logdir': logdir, 'rptdir': rptdir,
+               'logfd': logfd, 'policy': policy, 'verbosity' : __cmdLineOpts__.verbosity}
 
 
     # validate and load plugins
@@ -226,9 +227,9 @@ def sosreport():
         if __cmdLineOpts__.verbosity > 0:
             print "Executing plugin %s" % plugname
         if __cmdLineOpts__.multithread:
-            plug.doCollect(__cmdLineOpts__.verbosity)
+            plug.doCollect()
         else:
-            plug.copyStuff(__cmdLineOpts__.verbosity)    
+            plug.copyStuff()    
 
     # Wait for all the collection threads to exit
     if __cmdLineOpts__.multithread:
@@ -241,7 +242,7 @@ def sosreport():
     for plugname, plug in loadedplugins:
         if __cmdLineOpts__.verbosity > 1:
             print "Analyzing results of plugin %s" % plugname,
-        plug.analyze(__cmdLineOpts__.verbosity)
+        plug.analyze()
 
     # Sort the module names to do the report in alphabetical order
     loadedplugins.sort()
-- 
cgit