diff options
| author | Matthew Ahrens <mahrens@delphix.com> | 2016-04-15 14:07:19 -0700 |
|---|---|---|
| committer | Matthew Ahrens <mahrens@delphix.com> | 2016-04-15 14:07:19 -0700 |
| commit | 380fd671753dd199e149f10e9f73ec52cdfe4230 (patch) | |
| tree | 720cf2dfa6c7c180ff0c5d2042b2e54954428fe0 /usr/src/tools/scripts/git-pbchk.py | |
| parent | 93d2a904d17ac0073fa98bf62f89294d980c8b3d (diff) | |
| download | illumos-joyent-380fd671753dd199e149f10e9f73ec52cdfe4230.tar.gz | |
6913 pbchk throws an error with git rm'd files (use right fd)
Diffstat (limited to 'usr/src/tools/scripts/git-pbchk.py')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index ce016b684d..92303f967f 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -71,13 +71,13 @@ def git(command): try: p = subprocess.Popen(command, stdout=tmpfile, - stderr=subprocess.STDOUT) + stderr=subprocess.PIPE) except OSError, e: raise GitError("could not execute %s: %s\n" (command, e)) err = p.wait() if err != 0: - raise GitError(p.stdout.read()) + raise GitError(p.stderr.read()) tmpfile.seek(0) return tmpfile |