From 1bfba1212488e1eabdacf41a8ccedaa1bb93319e Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 5 Dec 2017 21:37:04 +0100 Subject: [PATCH] build: write out full rsync options Also put target host:dir on one line to make it more readable --- fdroidserver/build.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index b1b74464..bbb5a2b4 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -101,7 +101,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force): def send_dir(path): logging.debug("rsyncing " + path + " to " + ftp.getcwd()) try: - subprocess.check_output(['rsync', '-rplqe', + subprocess.check_output(['rsync', '--recursive', '--perms', '--links', '--quiet', '--rsh=' + 'ssh -o StrictHostKeyChecking=no' + ' -o UserKnownHostsFile=/dev/null' + ' -o LogLevel=FATAL' + @@ -110,9 +110,7 @@ def build_server(app, build, vcs, build_dir, output_dir, log_dir, force): ' -p ' + str(sshinfo['port']) + ' -i ' + sshinfo['idfile'], path, - sshinfo['user'] + - "@" + sshinfo['hostname'] + - ":" + ftp.getcwd()], + sshinfo['user'] + "@" + sshinfo['hostname'] + ":" + ftp.getcwd()], stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: raise FDroidException(str(e), e.output.decode()) -- 2.30.2