Merging jwb-dev branch to trunk

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/example_plugins/runcommand.py b/src/example_plugins/runcommand.py
index af8cc4fe..df8951d2 100755
--- a/src/example_plugins/runcommand.py
+++ b/src/example_plugins/runcommand.py
@@ -35,10 +35,10 @@ class runcommand(sos.plugintools.PluginBase):
     Your finished plugin should be included with your package and installed in python's
     site-packages/sos/plugins/ directory
     """
-    def collect(self):
+    def setup(self):
         ''' Run a command. Output is automatically included in the report.
         '''
-        self.runExe("/path/to/my/script --myoption --anotheroption")
+        self.collectExtOutput("/path/to/my/script --myoption --anotheroption")
 
         # if (for example) that command created files /foo/bar/baz.txt and
         # we want to include that in our report, we include the next line: