From: Marcus Hoffmann <bubuiic@aol.com>
Date: Tue, 5 Dec 2017 20:37:04 +0000 (+0100)
Subject: build: write out full rsync options
X-Git-Tag: 1.0.0~45^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1bfba1212488e1eabdacf41a8ccedaa1bb93319e;p=fdroidserver.git

build: write out full rsync options

Also put target host:dir on one line to make it more readable
---

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())