Return first parameter of console command only once

Reviewed-by: iustinp

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 0d86574..87fa149 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3160,8 +3160,7 @@ class LUConnectConsole(NoHooksLU):
     console_cmd = hyper.GetShellCommandForConsole(instance)
 
     # build ssh cmdline
-    cmd = self.ssh.BuildCmd(node, "root", console_cmd, batch=True, tty=True)
-    return cmd[0], cmd
+    return self.ssh.BuildCmd(node, "root", console_cmd, batch=True, tty=True)
 
 
 class LUReplaceDisks(LogicalUnit):

diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index a306087..fbd1164 100755 (executable)
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -505,11 +505,11 @@ def ConnectToInstanceConsole(opts, args):
   instance_name = args[0]
 
   op = opcodes.OpConnectConsole(instance_name=instance_name)
-  cmd, argv = SubmitOpCode(op)
+  cmd = SubmitOpCode(op)
   # drop lock and exec so other commands can run while we have console
   utils.Unlock("cmd")
   try:
-    os.execvp(cmd, argv)
+    os.execvp(cmd[0], cmd)
   finally:
     sys.stderr.write("Can't run console command %s with arguments:\n'%s'" %
                      (cmd, " ".join(argv)))