diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-06-17 22:13:28 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-06-17 22:13:28 -0400 |
| commit | 42782a35a35c25533d0e98fbdd88626745da0c4b (patch) | |
| tree | 6616e4159e1bd30b013c2ad0ebd7b9895ebf1bcc | |
| parent | a659c68cc24731e150244980663a78a7a15bb530 (diff) | |
Revert "Windows: Ssh connection caching is now supported."
Yeah, that didn't actually work. Got error messages like it couldn't read
from the control socket, so probably ssh doesn't really support that on
Windows, at least the cygwin ssh build I'm using.
| -rw-r--r-- | Annex/Ssh.hs | 12 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 99b3c4435..940cbb5a7 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -63,16 +63,18 @@ sshInfo (host, port) = go =<< sshCacheDir , Params "-o ControlMaster=auto -o ControlPersist=yes" ] -{- ssh connection caching creates sockets, so will not work on all file - - systems. A GIT_ANNEX_TMP_DIR can be provided to use +{- ssh connection caching creates sockets, so will not work on a + - crippled filesystem. A GIT_ANNEX_TMP_DIR can be provided to use - a different filesystem. -} sshCacheDir :: Annex (Maybe FilePath) sshCacheDir - | SysConfig.sshconnectioncaching = - ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig) + | SysConfig.sshconnectioncaching = ifM crippledFileSystem + ( maybe (return Nothing) usetmpdir =<< gettmpdir + , ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig) ( Just <$> fromRepo gitAnnexSshDir - , maybe (return Nothing) usetmpdir =<< gettmpdir + , return Nothing ) + ) | otherwise = return Nothing where gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR" diff --git a/debian/changelog b/debian/changelog index 246192e77..a31d5c457 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,6 @@ git-annex (4.20130602) UNRELEASED; urgency=low * annex.debug can now be set to enable debug logging by default. The webapp's debugging check box does this. * fsck: Avoid getting confused by Windows path separators - * Windows: Ssh connection caching is now supported. -- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400 |