[tor-commits] [check/master] Rsync is ignoring --delete

[arlo at torproject.org]

commit ae86f468c22ba7a65494f66dbfa86a8f445b798b
Author: Arlo Breault <arlolra at gmail.com>
Date:   Wed Nov 13 17:16:01 2013 -0800

    Rsync is ignoring --delete
    
    Kevin was right :)
---
 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0f7e460..d9c0ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,8 @@ data/cached-descriptors: descriptors
 descriptors_cutoff = $(shell date -v-1H -v-30M "+%Y/%m/%d %H:%M:%S")
 descriptors: data/descriptors/
 	@echo "Getting latest descriptors (This may take a while)"
-	@rsync $(rsync_server)::$(descriptors_dir) | awk 'BEGIN { before="$(descriptors_cutoff)"; } before < ($$3 " " $$4) && ($$5 != ".") { print $$5; }' | rsync -avz --files-from=- $(rsync_server)::$(descriptors_dir) --delete ./data/descriptors/
+	@find data/descriptors -type f -mmin +90 -delete
+	@rsync $(rsync_server)::$(descriptors_dir) | awk 'BEGIN { before="$(descriptors_cutoff)"; } before < ($$3 " " $$4) && ($$5 != ".") { print $$5; }' | rsync -avz --files-from=- $(rsync_server)::$(descriptors_dir) ./data/descriptors/
 	@echo Done
 
 data/langs: data/