From e19b557e7295d1fdce0c1b9d813c081f5f830d88 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 5 Jul 2012 13:07:56 +0200 Subject: [PATCH] use command instead of action --- sfa/client/sfaadmin.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py index ca5edf05..c1738cdc 100755 --- a/sfa/client/sfaadmin.py +++ b/sfa/client/sfaadmin.py @@ -375,7 +375,7 @@ class SfaAdmin: return (full_name,SfaAdmin.CATEGORIES[full_name]) def summary_usage (self, category=None): - print "Usage:", self.script_name + " category action []" + print "Usage:", self.script_name + " category command []" if category and category in SfaAdmin.CATEGORIES: categories=[category] else: @@ -414,7 +414,7 @@ class SfaAdmin: if not category_name or not category_class: self.summary_usage(category_name) - usage = "%%prog %s action [options]" % (category_name) + usage = "%%prog %s command [options]" % (category_name) parser = OptionParser(usage=usage) # ensure command is valid @@ -427,7 +427,7 @@ class SfaAdmin: command_input = argv.pop(0) command_name = Candidates (commands).only_match (command_input) - if hasattr(category_instance, command_name): + if command_name and hasattr(category_instance, command_name): command = getattr(category_instance, command_name) else: self.summary_usage(category_name) -- 2.47.0