filter out --delete rsync option

rsync does not have a --no-delete, so do it this way instead

1 files changed, 15 insertions, 3 deletions

diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index 0a62ff92f..21c570a87 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -48,9 +48,7 @@ remote = RemoteType {
 
 gen :: Git.Repo -> UUID -> Maybe RemoteConfig -> Annex (Remote Annex)
 gen r u c = do
-	url <- getConfig r "rsyncurl" (error "missing rsyncurl")
-	opts <- getConfig r "rsync-options" ""
-	let o = RsyncOpts url $ map Param $ words opts
+	o <- genRsyncOpts r
 	cst <- remoteCost r expensiveRemoteCost
 	return $ encryptableRemote c
 		(storeEncrypted o)
@@ -67,6 +65,20 @@ gen r u c = do
 			config = Nothing
 		}
 
+genRsyncOpts :: Git.Repo -> Annex RsyncOpts
+genRsyncOpts r = do
+	url <- getConfig r "rsyncurl" (error "missing rsyncurl")
+	opts <- getConfig r "rsync-options" ""
+	return $ RsyncOpts url $ map Param $ filter safe $ words opts
+	where
+		safe o
+			-- Don't allow user to pass --delete to rsync;
+			-- that could cause it to delete other keys
+			-- in the same hash bucket as a key it sends.
+			| o == "--delete" = False
+			| o == "--delete-excluded" = False
+			| otherwise = True
+
 rsyncSetup :: UUID -> RemoteConfig -> Annex RemoteConfig
 rsyncSetup u c = do
 	-- verify configuration is sane