diff options
Diffstat (limited to 'RemoteDaemon')
| -rw-r--r-- | RemoteDaemon/Transport/GCrypt.hs | 3 | ||||
| -rw-r--r-- | RemoteDaemon/Transport/Ssh.hs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/RemoteDaemon/Transport/GCrypt.hs b/RemoteDaemon/Transport/GCrypt.hs index ec71b1842..2ebd16189 100644 --- a/RemoteDaemon/Transport/GCrypt.hs +++ b/RemoteDaemon/Transport/GCrypt.hs @@ -14,12 +14,13 @@ import RemoteDaemon.Transport.Ssh (transportUsingCmd) import Git.GCrypt import Remote.Helper.Ssh import Remote.GCrypt (accessShellConfig) +import Annex.Ssh transport :: Transport transport rr@(RemoteRepo r gc) url h@(TransportHandle (LocalRepo g) _) ichan ochan | accessShellConfig gc = do r' <- encryptedRemote g r - v <- liftAnnex h $ git_annex_shell r' "notifychanges" [] [] + v <- liftAnnex h $ git_annex_shell ConsumeStdin r' "notifychanges" [] [] case v of Nothing -> noop Just (cmd, params) -> diff --git a/RemoteDaemon/Transport/Ssh.hs b/RemoteDaemon/Transport/Ssh.hs index 6f8e8323e..fdb75e871 100644 --- a/RemoteDaemon/Transport/Ssh.hs +++ b/RemoteDaemon/Transport/Ssh.hs @@ -23,7 +23,7 @@ import Control.Concurrent.Async transport :: Transport transport rr@(RemoteRepo r _) url h ichan ochan = do - v <- liftAnnex h $ git_annex_shell r "notifychanges" [] [] + v <- liftAnnex h $ git_annex_shell ConsumeStdin r "notifychanges" [] [] case v of Nothing -> noop Just (cmd, params) -> transportUsingCmd cmd params rr url h ichan ochan |