Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 16:22:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1247490 - display ssh output if upload command fails; r=ted

Browse Source
This commit is contained in:
Mike Shal 2016-02-10 20:21:16 -05:00
parent 9e3dec34bf
commit 7bc4f38705
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/upload.py
View File

@ -38,7 +38,12 @@ import errno
import hashlib
import shutil
from optparse import OptionParser
from subprocess import check_call, check_output, STDOUT
from subprocess import (
check_call,
check_output,
STDOUT,
CalledProcessError,
)
import redo
def OptionalEnvironmentVariable(v):
@ -93,7 +98,14 @@ def DoSSHCommand(command, user, host, port=None, ssh_key=None):
cmdline.extend(["%s@%s" % (user, host), command])
with redo.retrying(check_output, sleeptime=10) as f:
output = f(cmdline, stderr=STDOUT).strip()
try:
output = f(cmdline, stderr=STDOUT).strip()
except CalledProcessError as e:
print "failed ssh command output:"
print '=' * 20
print e.output
print '=' * 20
raise
return output
raise Exception("Command %s returned non-zero exit code" % cmdline)