summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorAdrian Likins <alikins@grimlock.devel.redhat.com>2008-06-30 13:44:54 -0400
committerAdrian Likins <alikins@grimlock.devel.redhat.com>2008-06-30 13:44:54 -0400
commit994c6dbd9065a050158d1bbaf2867a59b020a826 (patch)
treeeadbd3406331f27c996ba140bb21727efec8e3ea /func
parent81b1b46ca6a8d277688dc7bea1095591c804545c (diff)
downloadthird_party-func-994c6dbd9065a050158d1bbaf2867a59b020a826.tar.gz
third_party-func-994c6dbd9065a050158d1bbaf2867a59b020a826.tar.xz
third_party-func-994c6dbd9065a050158d1bbaf2867a59b020a826.zip
some help output clean ups.
func/overlord/command.py: set a default description. without it, none of the formatted description output gets showns func/overlord/func_command.py: better "usage" output func/overlord/func/show.py: better summary/useage of show.py
Diffstat (limited to 'func')
-rw-r--r--func/overlord/cmd_modules/show.py3
-rw-r--r--func/overlord/command.py3
-rw-r--r--func/overlord/func_command.py2
3 files changed, 5 insertions, 3 deletions
diff --git a/func/overlord/cmd_modules/show.py b/func/overlord/cmd_modules/show.py
index 92b094e..7eb9ec8 100644
--- a/func/overlord/cmd_modules/show.py
+++ b/func/overlord/cmd_modules/show.py
@@ -64,7 +64,8 @@ class ShowHardware(base_command.BaseCommand):
class Show(base_command.BaseCommand):
name = "show"
- usage = "various simple report stuff"
+ usage = "show reports about minion info"
+ summary = usage
subCommandClasses = [ShowHardware]
def addOptions(self):
self.parser.add_option("-v", "--verbose", dest="verbose",
diff --git a/func/overlord/command.py b/func/overlord/command.py
index ab4d532..6e8e137 100644
--- a/func/overlord/command.py
+++ b/func/overlord/command.py
@@ -97,7 +97,7 @@ class Command:
aliases = None
usage = None
summary = None
- description = None
+ description = "func is the command line interface for controlling func minions"
parentCommand = None
subCommands = None
subCommandClasses = None
@@ -258,6 +258,7 @@ class Command:
"""
Output help information.
"""
+
self.parser.print_help(file=self.stderr)
def outputUsage(self):
diff --git a/func/overlord/func_command.py b/func/overlord/func_command.py
index bd718bb..6e67ea4 100644
--- a/func/overlord/func_command.py
+++ b/func/overlord/func_command.py
@@ -30,7 +30,7 @@ from func.overlord import client
class FuncCommandLine(command.Command):
name = "func"
- usage = "func is the command line interface for controlling func minions"
+ usage = "func [--options] \"hostname glob\" module method [arg1] [arg2] ... "
subCommandClasses = [
call.Call, show.Show, copyfile.CopyFile,