Mike Frysinger | f601376 | 2019-06-13 02:30:51 -0400 | [diff] [blame] | 1 | # -*- coding:utf-8 -*- |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 2 | # |
| 3 | # Copyright (C) 2008 The Android Open Source Project |
| 4 | # |
| 5 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 6 | # you may not use this file except in compliance with the License. |
| 7 | # You may obtain a copy of the License at |
| 8 | # |
| 9 | # http://www.apache.org/licenses/LICENSE-2.0 |
| 10 | # |
| 11 | # Unless required by applicable law or agreed to in writing, software |
| 12 | # distributed under the License is distributed on an "AS IS" BASIS, |
| 13 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 14 | # See the License for the specific language governing permissions and |
| 15 | # limitations under the License. |
| 16 | |
Sarah Owens | cecd1d8 | 2012-11-01 22:59:27 -0700 | [diff] [blame] | 17 | from __future__ import print_function |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 18 | import os |
| 19 | import sys |
| 20 | import subprocess |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 21 | import tempfile |
Shawn O. Pearce | ca8c32c | 2010-05-11 18:21:33 -0700 | [diff] [blame] | 22 | from signal import SIGTERM |
Renaud Paquay | 2e70291 | 2016-11-01 11:23:38 -0700 | [diff] [blame] | 23 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 24 | from error import GitError |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 25 | from git_refs import HEAD |
Renaud Paquay | 2e70291 | 2016-11-01 11:23:38 -0700 | [diff] [blame] | 26 | import platform_utils |
Mike Frysinger | 8a11f6f | 2019-08-27 00:26:15 -0400 | [diff] [blame] | 27 | from repo_trace import REPO_TRACE, IsTrace, Trace |
Conley Owens | ff0a3c8 | 2014-01-30 14:46:03 -0800 | [diff] [blame] | 28 | from wrapper import Wrapper |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 29 | |
| 30 | GIT = 'git' |
Mike Frysinger | 82caef6 | 2020-02-11 18:51:08 -0500 | [diff] [blame] | 31 | # NB: These do not need to be kept in sync with the repo launcher script. |
| 32 | # These may be much newer as it allows the repo launcher to roll between |
| 33 | # different repo releases while source versions might require a newer git. |
| 34 | # |
| 35 | # The soft version is when we start warning users that the version is old and |
| 36 | # we'll be dropping support for it. We'll refuse to work with versions older |
| 37 | # than the hard version. |
| 38 | # |
| 39 | # git-1.7 is in (EOL) Ubuntu Precise. git-1.9 is in Ubuntu Trusty. |
| 40 | MIN_GIT_VERSION_SOFT = (1, 9, 1) |
| 41 | MIN_GIT_VERSION_HARD = (1, 7, 2) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 42 | GIT_DIR = 'GIT_DIR' |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 43 | |
| 44 | LAST_GITDIR = None |
| 45 | LAST_CWD = None |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 46 | |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 47 | _ssh_proxy_path = None |
| 48 | _ssh_sock_path = None |
Shawn O. Pearce | ca8c32c | 2010-05-11 18:21:33 -0700 | [diff] [blame] | 49 | _ssh_clients = [] |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 50 | |
Nico Sallembien | 1c85f4e | 2010-04-27 14:35:27 -0700 | [diff] [blame] | 51 | def ssh_sock(create=True): |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 52 | global _ssh_sock_path |
| 53 | if _ssh_sock_path is None: |
| 54 | if not create: |
| 55 | return None |
Mickaël Salaün | 2f6ab7f | 2012-09-30 00:37:55 +0200 | [diff] [blame] | 56 | tmp_dir = '/tmp' |
| 57 | if not os.path.exists(tmp_dir): |
| 58 | tmp_dir = tempfile.gettempdir() |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 59 | _ssh_sock_path = os.path.join( |
David Pursehouse | abdf750 | 2020-02-12 14:58:39 +0900 | [diff] [blame^] | 60 | tempfile.mkdtemp('', 'ssh-', tmp_dir), |
| 61 | 'master-%r@%h:%p') |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 62 | return _ssh_sock_path |
| 63 | |
| 64 | def _ssh_proxy(): |
| 65 | global _ssh_proxy_path |
| 66 | if _ssh_proxy_path is None: |
| 67 | _ssh_proxy_path = os.path.join( |
David Pursehouse | abdf750 | 2020-02-12 14:58:39 +0900 | [diff] [blame^] | 68 | os.path.dirname(__file__), |
| 69 | 'git_ssh') |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 70 | return _ssh_proxy_path |
| 71 | |
Shawn O. Pearce | ca8c32c | 2010-05-11 18:21:33 -0700 | [diff] [blame] | 72 | def _add_ssh_client(p): |
| 73 | _ssh_clients.append(p) |
| 74 | |
| 75 | def _remove_ssh_client(p): |
| 76 | try: |
| 77 | _ssh_clients.remove(p) |
| 78 | except ValueError: |
| 79 | pass |
| 80 | |
| 81 | def terminate_ssh_clients(): |
| 82 | global _ssh_clients |
| 83 | for p in _ssh_clients: |
| 84 | try: |
| 85 | os.kill(p.pid, SIGTERM) |
| 86 | p.wait() |
| 87 | except OSError: |
| 88 | pass |
| 89 | _ssh_clients = [] |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 90 | |
Shawn O. Pearce | 334851e | 2011-09-19 08:05:31 -0700 | [diff] [blame] | 91 | _git_version = None |
| 92 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 93 | class _GitCall(object): |
Shawn O. Pearce | 334851e | 2011-09-19 08:05:31 -0700 | [diff] [blame] | 94 | def version_tuple(self): |
| 95 | global _git_version |
Shawn O. Pearce | 334851e | 2011-09-19 08:05:31 -0700 | [diff] [blame] | 96 | if _git_version is None: |
Mike Frysinger | ca540ae | 2019-07-10 15:42:30 -0400 | [diff] [blame] | 97 | _git_version = Wrapper().ParseGitVersion() |
Conley Owens | ff0a3c8 | 2014-01-30 14:46:03 -0800 | [diff] [blame] | 98 | if _git_version is None: |
Mike Frysinger | ca540ae | 2019-07-10 15:42:30 -0400 | [diff] [blame] | 99 | print('fatal: unable to detect git version', file=sys.stderr) |
Shawn O. Pearce | 334851e | 2011-09-19 08:05:31 -0700 | [diff] [blame] | 100 | sys.exit(1) |
| 101 | return _git_version |
| 102 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 103 | def __getattr__(self, name): |
David Pursehouse | 54a4e60 | 2020-02-12 14:31:05 +0900 | [diff] [blame] | 104 | name = name.replace('_', '-') |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 105 | def fun(*cmdv): |
| 106 | command = [name] |
| 107 | command.extend(cmdv) |
| 108 | return GitCommand(None, command).Wait() == 0 |
| 109 | return fun |
| 110 | git = _GitCall() |
| 111 | |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 112 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 113 | def RepoSourceVersion(): |
| 114 | """Return the version of the repo.git tree.""" |
| 115 | ver = getattr(RepoSourceVersion, 'version', None) |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 116 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 117 | # We avoid GitCommand so we don't run into circular deps -- GitCommand needs |
| 118 | # to initialize version info we provide. |
| 119 | if ver is None: |
| 120 | env = GitCommand._GetBasicEnv() |
| 121 | |
| 122 | proj = os.path.dirname(os.path.abspath(__file__)) |
| 123 | env[GIT_DIR] = os.path.join(proj, '.git') |
| 124 | |
| 125 | p = subprocess.Popen([GIT, 'describe', HEAD], stdout=subprocess.PIPE, |
| 126 | env=env) |
| 127 | if p.wait() == 0: |
| 128 | ver = p.stdout.read().strip().decode('utf-8') |
| 129 | if ver.startswith('v'): |
| 130 | ver = ver[1:] |
| 131 | else: |
| 132 | ver = 'unknown' |
| 133 | setattr(RepoSourceVersion, 'version', ver) |
| 134 | |
| 135 | return ver |
| 136 | |
| 137 | |
| 138 | class UserAgent(object): |
| 139 | """Mange User-Agent settings when talking to external services |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 140 | |
| 141 | We follow the style as documented here: |
| 142 | https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent |
| 143 | """ |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 144 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 145 | _os = None |
| 146 | _repo_ua = None |
Mike Frysinger | 2f0951b | 2019-07-10 17:13:46 -0400 | [diff] [blame] | 147 | _git_ua = None |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 148 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 149 | @property |
| 150 | def os(self): |
| 151 | """The operating system name.""" |
| 152 | if self._os is None: |
| 153 | os_name = sys.platform |
| 154 | if os_name.lower().startswith('linux'): |
| 155 | os_name = 'Linux' |
| 156 | elif os_name == 'win32': |
| 157 | os_name = 'Win32' |
| 158 | elif os_name == 'cygwin': |
| 159 | os_name = 'Cygwin' |
| 160 | elif os_name == 'darwin': |
| 161 | os_name = 'Darwin' |
| 162 | self._os = os_name |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 163 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 164 | return self._os |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 165 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 166 | @property |
| 167 | def repo(self): |
| 168 | """The UA when connecting directly from repo.""" |
| 169 | if self._repo_ua is None: |
| 170 | py_version = sys.version_info |
| 171 | self._repo_ua = 'git-repo/%s (%s) git/%s Python/%d.%d.%d' % ( |
| 172 | RepoSourceVersion(), |
| 173 | self.os, |
| 174 | git.version_tuple().full, |
| 175 | py_version.major, py_version.minor, py_version.micro) |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 176 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 177 | return self._repo_ua |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 178 | |
Mike Frysinger | 2f0951b | 2019-07-10 17:13:46 -0400 | [diff] [blame] | 179 | @property |
| 180 | def git(self): |
| 181 | """The UA when running git.""" |
| 182 | if self._git_ua is None: |
| 183 | self._git_ua = 'git/%s (%s) git-repo/%s' % ( |
| 184 | git.version_tuple().full, |
| 185 | self.os, |
| 186 | RepoSourceVersion()) |
| 187 | |
| 188 | return self._git_ua |
| 189 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 190 | user_agent = UserAgent() |
Mike Frysinger | 369814b | 2019-07-10 17:10:07 -0400 | [diff] [blame] | 191 | |
Xin Li | 745be2e | 2019-06-03 11:24:30 -0700 | [diff] [blame] | 192 | def git_require(min_version, fail=False, msg=''): |
Shawn O. Pearce | 334851e | 2011-09-19 08:05:31 -0700 | [diff] [blame] | 193 | git_version = git.version_tuple() |
| 194 | if min_version <= git_version: |
Shawn O. Pearce | 2ec00b9 | 2009-06-12 09:32:50 -0700 | [diff] [blame] | 195 | return True |
| 196 | if fail: |
David Pursehouse | 7e6dd2d | 2012-10-25 12:40:51 +0900 | [diff] [blame] | 197 | need = '.'.join(map(str, min_version)) |
Xin Li | 745be2e | 2019-06-03 11:24:30 -0700 | [diff] [blame] | 198 | if msg: |
| 199 | msg = ' for ' + msg |
| 200 | print('fatal: git %s or later required%s' % (need, msg), file=sys.stderr) |
Shawn O. Pearce | 2ec00b9 | 2009-06-12 09:32:50 -0700 | [diff] [blame] | 201 | sys.exit(1) |
| 202 | return False |
| 203 | |
Shawn O. Pearce | f18cb76 | 2010-12-07 11:41:05 -0800 | [diff] [blame] | 204 | def _setenv(env, name, value): |
| 205 | env[name] = value.encode() |
| 206 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 207 | class GitCommand(object): |
| 208 | def __init__(self, |
| 209 | project, |
| 210 | cmdv, |
David Pursehouse | e5913ae | 2020-02-12 13:56:59 +0900 | [diff] [blame] | 211 | bare=False, |
| 212 | provide_stdin=False, |
| 213 | capture_stdout=False, |
| 214 | capture_stderr=False, |
| 215 | disable_editor=False, |
| 216 | ssh_proxy=False, |
| 217 | cwd=None, |
| 218 | gitdir=None): |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 219 | env = self._GetBasicEnv() |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 220 | |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 221 | # If we are not capturing std* then need to print it. |
| 222 | self.tee = {'stdout': not capture_stdout, 'stderr': not capture_stderr} |
| 223 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 224 | if disable_editor: |
Shawn O. Pearce | f18cb76 | 2010-12-07 11:41:05 -0800 | [diff] [blame] | 225 | _setenv(env, 'GIT_EDITOR', ':') |
Shawn O. Pearce | fb23161 | 2009-04-10 18:53:46 -0700 | [diff] [blame] | 226 | if ssh_proxy: |
Shawn O. Pearce | f18cb76 | 2010-12-07 11:41:05 -0800 | [diff] [blame] | 227 | _setenv(env, 'REPO_SSH_SOCK', ssh_sock()) |
| 228 | _setenv(env, 'GIT_SSH', _ssh_proxy()) |
Jonathan Nieder | c00d28b | 2017-10-19 14:23:10 -0700 | [diff] [blame] | 229 | _setenv(env, 'GIT_SSH_VARIANT', 'ssh') |
Shawn O. Pearce | 62d0b10 | 2012-06-05 15:11:15 -0700 | [diff] [blame] | 230 | if 'http_proxy' in env and 'darwin' == sys.platform: |
Shawn O. Pearce | 337aee0 | 2012-06-13 10:40:46 -0700 | [diff] [blame] | 231 | s = "'http.proxy=%s'" % (env['http_proxy'],) |
Shawn O. Pearce | 62d0b10 | 2012-06-05 15:11:15 -0700 | [diff] [blame] | 232 | p = env.get('GIT_CONFIG_PARAMETERS') |
| 233 | if p is not None: |
| 234 | s = p + ' ' + s |
| 235 | _setenv(env, 'GIT_CONFIG_PARAMETERS', s) |
Dan Willemsen | 466b8c4 | 2015-11-25 13:26:39 -0800 | [diff] [blame] | 236 | if 'GIT_ALLOW_PROTOCOL' not in env: |
| 237 | _setenv(env, 'GIT_ALLOW_PROTOCOL', |
Jonathan Nieder | 203153e | 2016-02-26 18:53:54 -0800 | [diff] [blame] | 238 | 'file:git:http:https:ssh:persistent-http:persistent-https:sso:rpc') |
Mike Frysinger | 2f0951b | 2019-07-10 17:13:46 -0400 | [diff] [blame] | 239 | _setenv(env, 'GIT_HTTP_USER_AGENT', user_agent.git) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 240 | |
| 241 | if project: |
| 242 | if not cwd: |
| 243 | cwd = project.worktree |
| 244 | if not gitdir: |
| 245 | gitdir = project.gitdir |
| 246 | |
| 247 | command = [GIT] |
| 248 | if bare: |
| 249 | if gitdir: |
Shawn O. Pearce | f18cb76 | 2010-12-07 11:41:05 -0800 | [diff] [blame] | 250 | _setenv(env, GIT_DIR, gitdir) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 251 | cwd = None |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 252 | command.append(cmdv[0]) |
| 253 | # Need to use the --progress flag for fetch/clone so output will be |
| 254 | # displayed as by default git only does progress output if stderr is a TTY. |
| 255 | if sys.stderr.isatty() and cmdv[0] in ('fetch', 'clone'): |
| 256 | if '--progress' not in cmdv and '--quiet' not in cmdv: |
| 257 | command.append('--progress') |
| 258 | command.extend(cmdv[1:]) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 259 | |
| 260 | if provide_stdin: |
| 261 | stdin = subprocess.PIPE |
| 262 | else: |
| 263 | stdin = None |
| 264 | |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 265 | stdout = subprocess.PIPE |
| 266 | stderr = subprocess.PIPE |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 267 | |
Shawn O. Pearce | ad3193a | 2009-04-18 09:54:51 -0700 | [diff] [blame] | 268 | if IsTrace(): |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 269 | global LAST_CWD |
| 270 | global LAST_GITDIR |
| 271 | |
| 272 | dbg = '' |
| 273 | |
| 274 | if cwd and LAST_CWD != cwd: |
| 275 | if LAST_GITDIR or LAST_CWD: |
| 276 | dbg += '\n' |
| 277 | dbg += ': cd %s\n' % cwd |
| 278 | LAST_CWD = cwd |
| 279 | |
| 280 | if GIT_DIR in env and LAST_GITDIR != env[GIT_DIR]: |
| 281 | if LAST_GITDIR or LAST_CWD: |
| 282 | dbg += '\n' |
| 283 | dbg += ': export GIT_DIR=%s\n' % env[GIT_DIR] |
| 284 | LAST_GITDIR = env[GIT_DIR] |
| 285 | |
| 286 | dbg += ': ' |
| 287 | dbg += ' '.join(command) |
| 288 | if stdin == subprocess.PIPE: |
| 289 | dbg += ' 0<|' |
| 290 | if stdout == subprocess.PIPE: |
| 291 | dbg += ' 1>|' |
| 292 | if stderr == subprocess.PIPE: |
| 293 | dbg += ' 2>|' |
Shawn O. Pearce | ad3193a | 2009-04-18 09:54:51 -0700 | [diff] [blame] | 294 | Trace('%s', dbg) |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 295 | |
| 296 | try: |
| 297 | p = subprocess.Popen(command, |
David Pursehouse | e5913ae | 2020-02-12 13:56:59 +0900 | [diff] [blame] | 298 | cwd=cwd, |
| 299 | env=env, |
| 300 | stdin=stdin, |
| 301 | stdout=stdout, |
| 302 | stderr=stderr) |
Sarah Owens | a5be53f | 2012-09-09 15:37:57 -0700 | [diff] [blame] | 303 | except Exception as e: |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 304 | raise GitError('%s: %s' % (command[1], e)) |
| 305 | |
Shawn O. Pearce | ca8c32c | 2010-05-11 18:21:33 -0700 | [diff] [blame] | 306 | if ssh_proxy: |
| 307 | _add_ssh_client(p) |
| 308 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 309 | self.process = p |
| 310 | self.stdin = p.stdin |
| 311 | |
Mike Frysinger | 71b0f31 | 2019-09-30 22:39:49 -0400 | [diff] [blame] | 312 | @staticmethod |
| 313 | def _GetBasicEnv(): |
| 314 | """Return a basic env for running git under. |
| 315 | |
| 316 | This is guaranteed to be side-effect free. |
| 317 | """ |
| 318 | env = os.environ.copy() |
| 319 | for key in (REPO_TRACE, |
| 320 | GIT_DIR, |
| 321 | 'GIT_ALTERNATE_OBJECT_DIRECTORIES', |
| 322 | 'GIT_OBJECT_DIRECTORY', |
| 323 | 'GIT_WORK_TREE', |
| 324 | 'GIT_GRAFT_FILE', |
| 325 | 'GIT_INDEX_FILE'): |
| 326 | env.pop(key, None) |
| 327 | return env |
| 328 | |
The Android Open Source Project | cf31fe9 | 2008-10-21 07:00:00 -0700 | [diff] [blame] | 329 | def Wait(self): |
Shawn O. Pearce | ca8c32c | 2010-05-11 18:21:33 -0700 | [diff] [blame] | 330 | try: |
Ulrik Sjölin | 498fe90 | 2011-09-11 22:59:37 +0200 | [diff] [blame] | 331 | p = self.process |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 332 | rc = self._CaptureOutput() |
Shawn O. Pearce | ca8c32c | 2010-05-11 18:21:33 -0700 | [diff] [blame] | 333 | finally: |
| 334 | _remove_ssh_client(p) |
| 335 | return rc |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 336 | |
| 337 | def _CaptureOutput(self): |
| 338 | p = self.process |
Renaud Paquay | 2e70291 | 2016-11-01 11:23:38 -0700 | [diff] [blame] | 339 | s_in = platform_utils.FileDescriptorStreams.create() |
| 340 | s_in.add(p.stdout, sys.stdout, 'stdout') |
| 341 | s_in.add(p.stderr, sys.stderr, 'stderr') |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 342 | self.stdout = '' |
| 343 | self.stderr = '' |
| 344 | |
Renaud Paquay | 2e70291 | 2016-11-01 11:23:38 -0700 | [diff] [blame] | 345 | while not s_in.is_done: |
| 346 | in_ready = s_in.select() |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 347 | for s in in_ready: |
Renaud Paquay | 2e70291 | 2016-11-01 11:23:38 -0700 | [diff] [blame] | 348 | buf = s.read() |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 349 | if not buf: |
| 350 | s_in.remove(s) |
| 351 | continue |
Anthony King | 6cfc68e | 2015-06-03 16:39:32 +0100 | [diff] [blame] | 352 | if not hasattr(buf, 'encode'): |
| 353 | buf = buf.decode() |
John L. Villalovos | 9c76f67 | 2015-03-16 20:49:10 -0700 | [diff] [blame] | 354 | if s.std_name == 'stdout': |
| 355 | self.stdout += buf |
| 356 | else: |
| 357 | self.stderr += buf |
| 358 | if self.tee[s.std_name]: |
| 359 | s.dest.write(buf) |
| 360 | s.dest.flush() |
| 361 | return p.wait() |