Merge pull request #17 from jhjaggars/2.3_pull_request

Major updates to most of SoSReport

Code reorganization
Cross platform support for Windows, OS X and Linux
Dynamically loaded policies
Support for loading plugins from multiple locations
via path modification of sos.plugins
Support for running via Jython
Support for executing from a jarfile
Support for json based reporting infrastructure
- Previous reporting methods still exist
Support for other checksum algorithms (determined by policy)
Support for other compression algorithms (determined by policy)
New plugin API for writing arbitrary information in a new file inside
the report archive.
New plugin API for modifying files that have been added to the
archive.
Added API for global plugin options
- external interface is unavailable at this time
Many small bugfixes

1 files changed, 3 insertions, 5 deletions

diff --git a/sosreport b/sosreport
index 0908a1b4..5d3cc749 100755
--- a/sosreport
+++ b/sosreport
@@ -15,13 +15,11 @@
 
 """ sos entry point. """
 
-from sos.sosreport import sosreport, doExitCode
+#from sos.sosreport import sosreport, doExitCode
+from sos.sosreport import main
 import sys
 
 if __name__ == '__main__':
-    try:
-        sosreport(sys.argv[1:])
-    except KeyboardInterrupt:
-        doExitCode()
+    main(sys.argv[1:])
 
 # vim:ts=4 et sw=4