From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 10 Oct 2014 01:22:50 +0000 (-0400)
Subject: fix rsync's chmod on local copy
X-Git-Tag: 0.3.0~27^2~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d2b5b86ed5b77088586743882c6d55760a95f004;p=fdroidserver.git

fix rsync's chmod on local copy

rsync's --chmod works a bit oddly, it only affects the source files. To
make it set the destintation with the perms set in --chmod, the --perms
flag must also be included.
---

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index 473529db..21454b80 100644
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -143,7 +143,7 @@ def update_serverwebroot(serverwebroot, repo_section):
 
 
 def _local_sync(fromdir, todir):
-    rsyncargs = ['rsync', '--recursive', '--links', '--times',
+    rsyncargs = ['rsync', '--recursive', '--links', '--times', '--perms',
                  '--one-file-system', '--delete', '--chmod=Da+rx,Fa-x,a+r,u+w']
     # use stricter rsync checking on all files since people using offline mode
     # are already prioritizing security above ease and speed