diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-06-02 16:34:52 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-06-02 16:34:52 -0400 |
| commit | 0ff2732d9583fd70d75cd8e365587803a7ac75ed (patch) | |
| tree | 8dde2949bfd29ea6adcf2a40f992fe6970872ebd /RemoteDaemon/Transport | |
| parent | b986b85cec119403c1a62fc268e26ff948de9fca (diff) | |
make LocalRepo a newtype
Diffstat (limited to 'RemoteDaemon/Transport')
| -rw-r--r-- | RemoteDaemon/Transport/GCrypt.hs | 2 | ||||
| -rw-r--r-- | RemoteDaemon/Transport/Ssh.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/RemoteDaemon/Transport/GCrypt.hs b/RemoteDaemon/Transport/GCrypt.hs index 48b9da179..ec71b1842 100644 --- a/RemoteDaemon/Transport/GCrypt.hs +++ b/RemoteDaemon/Transport/GCrypt.hs @@ -16,7 +16,7 @@ import Remote.Helper.Ssh import Remote.GCrypt (accessShellConfig) transport :: Transport -transport rr@(RemoteRepo r gc) url h@(TransportHandle g _) ichan ochan +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" [] [] diff --git a/RemoteDaemon/Transport/Ssh.hs b/RemoteDaemon/Transport/Ssh.hs index eda6bca1c..73c88054c 100644 --- a/RemoteDaemon/Transport/Ssh.hs +++ b/RemoteDaemon/Transport/Ssh.hs @@ -29,10 +29,10 @@ transport rr@(RemoteRepo r _) url h ichan ochan = do Just (cmd, params) -> transportUsingCmd cmd params rr url h ichan ochan transportUsingCmd :: FilePath -> [CommandParam] -> Transport -transportUsingCmd cmd params rr@(RemoteRepo r gc) url h@(TransportHandle g s) ichan ochan = do +transportUsingCmd cmd params rr@(RemoteRepo r gc) url h@(TransportHandle (LocalRepo g) s) ichan ochan = do -- enable ssh connection caching wherever inLocalRepo is called g' <- liftAnnex h $ sshOptionsTo r gc g - let transporthandle = TransportHandle g' s + let transporthandle = TransportHandle (LocalRepo g') s transportUsingCmd' cmd params rr url transporthandle ichan ochan transportUsingCmd' :: FilePath -> [CommandParam] -> Transport |