From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 26 Jun 2014 17:05:24 +0000 (-0400)
Subject: switch serverwebroot rsync to --archive for guaranteed full sync
X-Git-Tag: 0.2^2~4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fd24416f4e8fa679929f278234d12841bb70a899;p=fdroidserver.git

switch serverwebroot rsync to --archive for guaranteed full sync

In `fdroid server update`, the rsync command used --update, which
`man rsync` says: "skip files that are newer on the receiver".  That could
cause issues of the public repo getting out of sync with the private,
master repo.  --archive is a better sync method since it aims to exactly
reproduce the sending dir to the receiving dir.
---

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index 3efe5603..100fff29 100644
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -115,7 +115,7 @@ def update_awsbucket(repo_section):
 
 
 def update_serverwebroot(repo_section):
-    rsyncargs = ['rsync', '--update', '--recursive', '--delete']
+    rsyncargs = ['rsync', '--archive', '--delete']
     if options.verbose:
         rsyncargs += ['--verbose']
     if options.quiet: