From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 5 Jul 2012 11:07:56 +0000 (+0200)
Subject: use command instead of action
X-Git-Tag: sfa-2.1-12~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e19b557e7295d1fdce0c1b9d813c081f5f830d88;hp=64a3d72d8b407d63510bd24cd5af6b936860881e;p=sfa.git

use command instead of action
---

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 [<options>]"
+        print "Usage:", self.script_name + " category command [<options>]"
         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)