kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 19:10:11 +01:00
Code Activity

build: write out full rsync options

Browse Source 
Also put target host:dir on one line to make it more readable
This commit is contained in:
Marcus Hoffmann 2017-12-05 21:37:04 +01:00
parent e12e1b6a5c
commit 1bfba12124
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/build.py
View File

@ -101,7 +101,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
def send_dir(path): def send_dir(path):
logging.debug("rsyncing " + path + " to " + ftp.getcwd()) logging.debug("rsyncing " + path + " to " + ftp.getcwd())
try: try:
subprocess.check_output(['rsync', '-rplqe', subprocess.check_output(['rsync', '--recursive', '--perms', '--links', '--quiet', '--rsh=' +
'ssh -o StrictHostKeyChecking=no' + 'ssh -o StrictHostKeyChecking=no' +
' -o UserKnownHostsFile=/dev/null' + ' -o UserKnownHostsFile=/dev/null' +
' -o LogLevel=FATAL' + ' -o LogLevel=FATAL' +
@ -110,9 +110,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force):
' -p ' + str(sshinfo['port']) + ' -p ' + str(sshinfo['port']) +
' -i ' + sshinfo['idfile'], ' -i ' + sshinfo['idfile'],
path, path,
sshinfo['user'] + sshinfo['user'] + "@" + sshinfo['hostname'] + ":" + ftp.getcwd()],
"@" + sshinfo['hostname'] +
":" + ftp.getcwd()],
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise FDroidException(str(e), e.output.decode()) raise FDroidException(str(e), e.output.decode())