Revision ffafdcf6 qa/qa_utils.py

b/qa/qa_utils.py
341 341
    utils.RemoveFile(sname)
342 342

  
343 343

  
344
def GetCommandOutput(node, cmd, tty=None, use_multiplexer=True,
344
def GetCommandOutput(node, cmd, tty=None, use_multiplexer=True, log_cmd=True,
345 345
                     fail=False):
346 346
  """Returns the output of a command executed on the given node.
347 347

  
......
354 354
  @type use_multiplexer: bool
355 355
  @param use_multiplexer: if the SSH multiplexer provided by the QA should be
356 356
                          used or not
357
  @type log_cmd: bool
358
  @param log_cmd: if the command should be logged
357 359
  @type fail: bool
358 360
  @param fail: whether the command is expected to fail
359 361
  """
360 362
  assert cmd
361 363
  p = StartLocalCommand(GetSSHCommand(node, cmd, tty=tty,
362 364
                                      use_multiplexer=use_multiplexer),
363
                        stdout=subprocess.PIPE)
365
                        stdout=subprocess.PIPE, log_cmd=log_cmd)
364 366
  rcode = p.wait()
365 367
  _AssertRetCode(rcode, fail, cmd, node)
366 368
  return p.stdout.read()

Also available in: Unified diff