mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages1 Wiki Activity Actions

fix accidental commit

Browse source
This commit is contained in:
Joey Hess 2018-11-20 11:43:33 -04:00
parent 3c1e5ac0a3
commit 65bb30bcf5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 4 deletions

6
Annex/Ssh.hs
View file

@ -44,7 +44,6 @@ import Annex.LockPool
#endif #endif
import Control.Concurrent.STM import Control.Concurrent.STM
import Control.Concurrent.Async
{- Some ssh commands are fed stdin on a pipe and so should be allowed to {- Some ssh commands are fed stdin on a pipe and so should be allowed to
- consume it. But ssh commands that are not piped stdin should generally - consume it. But ssh commands that are not piped stdin should generally
@ -204,13 +203,12 @@ prepSocket socketfile sshhost sshparams = do
-- See if ssh can connect in batch mode, -- See if ssh can connect in batch mode,
-- if so there's no need to block for a password -- if so there's no need to block for a password
-- prompt. -- prompt.
unlessM (tryssh ["-o", "BatchMode=true"]) $ do unlessM (tryssh ["-o", "BatchMode=true"]) $
liftIO $ print "ok then"
-- ssh needs to prompt (probably) -- ssh needs to prompt (probably)
-- If the user enters the wrong password, -- If the user enters the wrong password,
-- ssh will tell them, so we can ignore -- ssh will tell them, so we can ignore
-- failure. -- failure.
let p = void $ prompt $ tryssh [] in p `concurrently` p void $ prompt $ tryssh []
-- Try to ssh to the host quietly. Returns True if ssh apparently -- Try to ssh to the host quietly. Returns True if ssh apparently
-- connected to the host successfully. If ssh failed to connect, -- connected to the host successfully. If ssh failed to connect,
-- returns False. -- returns False.