diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-06-30 15:43:21 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-06-30 15:43:21 -0400 |
| commit | 6098591db6f89e7e9123a70a4c1bd951b002176d (patch) | |
| tree | 216e9e0f3d8ae22db8d2ef2380c1b9ee9eb817b8 | |
| parent | 2b775811f2b2be02d04627a977a253c3ccf9244d (diff) | |
| parent | b9733062512d4a4ff125461ba878a696e3c435a3 (diff) | |
| download | third_party-func-6098591db6f89e7e9123a70a4c1bd951b002176d.tar.gz third_party-func-6098591db6f89e7e9123a70a4c1bd951b002176d.tar.xz third_party-func-6098591db6f89e7e9123a70a4c1bd951b002176d.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/func
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | func/overlord/cmd_modules/show.py | 3 | ||||
| -rw-r--r-- | func/overlord/command.py | 5 | ||||
| -rw-r--r-- | func/overlord/func_command.py | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -7,3 +7,7 @@ build MANIFEST rpm-build dist +rpms/ +srpms/ +tars/ +test/test-it.conf* 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 4b815f0..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 @@ -135,7 +135,7 @@ class Command: for name, command in self.subCommands.items(): formatter.addCommand(name, command.summary or command.description) - print formatter.format_description("") + # expand %command for the bottom usage usage = self.usage or self.name @@ -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, |