X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/9a0331560c6d801427ac79d3c9a7eec9a29cca20..acec9d51f4aea4b4571fcee477bea935487b8b83:/lib/cli.py

diff --git a/lib/cli.py b/lib/cli.py
index 5e75da6..917b345 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -251,16 +251,15 @@ def _ParseArgs(argv, commands, aliases):
            "\n%(bin)s <command> --help to see details, or"
            " man %(bin)s\n" % {"bin": binary})
     # compute the max line length for cmd + usage
-    mlen = max([len(" %s %s" % (cmd, commands[cmd][3])) for cmd in commands])
+    mlen = max([len(" %s" % cmd) for cmd in commands])
     mlen = min(60, mlen) # should not get here...
     # and format a nice command list
     print "Commands:"
     for cmd in sortedcmds:
-      cmdstr = " %s %s" % (cmd, commands[cmd][3])
+      cmdstr = " %s" % (cmd,)
       help_text = commands[cmd][4]
       help_lines = textwrap.wrap(help_text, 79-3-mlen)
-      print "%-*s - %s" % (mlen, cmdstr,
-                                          help_lines.pop(0))
+      print "%-*s - %s" % (mlen, cmdstr, help_lines.pop(0))
       for line in help_lines:
         print "%-*s   %s" % (mlen, "", line)
     print
@@ -378,6 +377,7 @@ def SubmitOpCode(op, proc=None, feedback_fn=None):
   interaction functions.
 
   """
+  # TODO: Fix feedback_fn situation.
   cl = luxi.Client()
   job = opcodes.Job(op_list=[op])
   jid = SubmitJob(job)
@@ -408,12 +408,6 @@ def SubmitOpCode(op, proc=None, feedback_fn=None):
     raise errors.OpExecError(op_result[0])
   return op_result[0]
 
-  if feedback_fn is None:
-    feedback_fn = logger.ToStdout
-  if proc is None:
-    proc = mcpu.Processor(feedback=feedback_fn)
-  return proc.ExecOpCode(op)
-
 
 def SubmitJob(job, cl=None):
   if cl is None:
@@ -512,7 +506,7 @@ def GenericMain(commands, override=None, aliases=None):
     for key, val in override.iteritems():
       setattr(options, key, val)
 
-  logger.SetupLogging(debug=options.debug, program=binary)
+  logger.SetupLogging(program=binary, debug=options.debug)
 
   utils.debug = options.debug