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