Merge branch 'master' into symlink-missing

This commit is contained in:
Joey Hess 2020-11-13 14:19:45 -04:00
commit 3899e216af
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 135 additions and 3 deletions

View file

@ -151,7 +151,7 @@ toPerform dest removewhen key afile fastcheck isthere = do
when fastcheck $
warning "This could have failed because --fast is enabled."
stop
Right True -> logMove srcuuid destuuid False key $ \deststartedwithcopy ->
Right True -> logMove srcuuid destuuid True key $ \deststartedwithcopy ->
finish deststartedwithcopy $
unlessM (expectedPresent dest key) $
Remote.logStatus dest key InfoPresent