Commit e3606abc authored by maruel@chromium.org's avatar maruel@chromium.org

Fix check_output usage in trychange.py

Update the command for subprocess.CalledProcessError

TBR=dpranke@chromium.org
BUG=
TEST=


Review URL: http://codereview.chromium.org/7860047

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@100410 0039d316-1c4b-4281-b951-d872f2087c98
parent 2a5b6a2a
......@@ -401,12 +401,10 @@ def _SendChangeSVN(options):
if scm.SVN.AssertVersion("1.5")[0]:
command.append('--no-ignore')
subprocess2.check_output(command, stdout=subprocess2.VOID)
subprocess2.check_output(
command, stdout=subprocess2.PIPE, stderr=subprocess2.STDOUT)
except subprocess2.CalledProcessError, e:
out = e.stdout
if e.stderr:
out += e.stderr
raise NoTryServerAccess(' '.join(e.command) + '\nOuput:\n' + out)
raise NoTryServerAccess(' '.join(e.cmd) + '\nOuput:\n' + e.stdout)
finally:
temp_file.close()
shutil.rmtree(temp_dir, True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment