| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """A wrapper for subprocess to make calling shell commands easier.""" | 5 """A wrapper for subprocess to make calling shell commands easier.""" |
| 6 | 6 |
| 7 | 7 |
| 8 import logging | 8 import logging |
| 9 import subprocess | 9 import subprocess |
| 10 | 10 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 args: A string or a sequence of program arguments. The program to execute is | 33 args: A string or a sequence of program arguments. The program to execute is |
| 34 the string or the first item in the args sequence. | 34 the string or the first item in the args sequence. |
| 35 cwd: If not None, the subprocess's current directory will be changed to | 35 cwd: If not None, the subprocess's current directory will be changed to |
| 36 |cwd| before it's executed. | 36 |cwd| before it's executed. |
| 37 shell: Whether to execute args as a shell command. | 37 shell: Whether to execute args as a shell command. |
| 38 | 38 |
| 39 Returns: | 39 Returns: |
| 40 Captures and returns the command's stdout. | 40 Captures and returns the command's stdout. |
| 41 Prints the command's stderr to logger (which defaults to stdout). | 41 Prints the command's stderr to logger (which defaults to stdout). |
| 42 """ | 42 """ |
| 43 (_, output) = GetCmdStatusAndOutput(args, cwd, shell) |
| 44 return output |
| 45 |
| 46 def GetCmdStatusAndOutput(args, cwd=None, shell=False): |
| 47 """Executes a subprocess and returns its exit code and output. |
| 48 |
| 49 Args: |
| 50 args: A string or a sequence of program arguments. The program to execute is |
| 51 the string or the first item in the args sequence. |
| 52 cwd: If not None, the subprocess's current directory will be changed to |
| 53 |cwd| before it's executed. |
| 54 shell: Whether to execute args as a shell command. |
| 55 |
| 56 Returns: |
| 57 The tuple (exit code, output). |
| 58 """ |
| 43 logging.info(str(args) + ' ' + (cwd or '')) | 59 logging.info(str(args) + ' ' + (cwd or '')) |
| 44 p = subprocess.Popen(args=args, cwd=cwd, stdout=subprocess.PIPE, | 60 p = subprocess.Popen(args=args, cwd=cwd, stdout=subprocess.PIPE, |
| 45 stderr=subprocess.PIPE, shell=shell) | 61 stderr=subprocess.PIPE, shell=shell) |
| 46 stdout, stderr = p.communicate() | 62 stdout, stderr = p.communicate() |
| 63 exit_code = p.returncode |
| 47 if stderr: | 64 if stderr: |
| 48 logging.critical(stderr) | 65 logging.critical(stderr) |
| 49 logging.info(stdout[:4096]) # Truncate output longer than 4k. | 66 logging.info(stdout[:4096]) # Truncate output longer than 4k. |
| 50 return stdout | 67 return (exit_code, stdout) |
| OLD | NEW |