gnt-instance console: Improve error reporting

If the SSH command fails, this will give a more detailed error
message than before.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

diff --git a/lib/client/gnt_instance.py b/lib/client/gnt_instance.py
index 431bc17..0bca839 100644 (file)
--- a/lib/client/gnt_instance.py
+++ b/lib/client/gnt_instance.py
@@ -959,12 +959,12 @@ def ConnectToInstanceConsole(opts, args):
   if opts.show_command:
     ToStdout("%s", utils.ShellQuoteArgs(cmd))
   else:
-    try:
-      os.execvp(cmd[0], cmd)
-    finally:
-      ToStderr("Can't run console command %s with arguments:\n'%s'",
-               cmd[0], " ".join(cmd))
-      os._exit(1) # pylint: disable-msg=W0212
+    result = utils.RunCmd(cmd, interactive=True)
+    if result.failed:
+      raise errors.OpExecError("Console command \"%s\" failed: %s" %
+                               (utils.ShellQuoteArgs(cmd), result.fail_reason))
+
+  return constants.EXIT_SUCCESS
 
 
 def _FormatLogicalID(dev_type, logical_id, roman):