diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-14 22:39:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-14 22:39:59 -0400 |
| commit | b0b41de485b60ea852710e83f453dfcd585300f5 (patch) | |
| tree | 3715e46a0c1ff609313d2356c73a4c1edb346040 | |
| parent | f592ef5b5c28e67849243a6c9e6bf52dfcb1521e (diff) | |
Revert "work around what is likely a bug in a new version of ssh"
This reverts commit 07ab0b85ce375c1882e13780e525aba8918c6fdf.
Bug was fixed in -2 of debian package, and is fixed upstream
(unsure what upstream release specificically)
| -rw-r--r-- | Assistant/Ssh.hs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index fdb56f08b..82da9e33a 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -315,14 +315,10 @@ setSshConfig sshdata config = do - to allow unMangleSshHostName to work. Any unusual characters in the - username or directory are url encoded, except using "." rather than "%" - (the latter has special meaning to ssh). - - - - The mangled hostname is lower-cased because openssh 6.5p1 does not work - - if ssh config Host lines contain any upper-case. -} mangleSshHostName :: SshData -> String -mangleSshHostName sshdata = map toLower $ - "git-annex-" ++ T.unpack (sshHostName sshdata) - ++ "-" ++ escape extra +mangleSshHostName sshdata = "git-annex-" ++ T.unpack (sshHostName sshdata) + ++ "-" ++ escape extra where extra = intercalate "_" $ map T.unpack $ catMaybes [ sshUserName sshdata |