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

Windows: Ssh connection caching is now supported.

Browse source 
Turns out the socket stuff just works on windows.
This commit is contained in:
Joey Hess 2013-06-17 22:05:49 -04:00
parent 724272e6b3
commit 07a17f58b7
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Annex/Ssh.hs
View file

@ -63,17 +63,15 @@ sshInfo (host, port) = go =<< sshCacheDir
, Params "-o ControlMaster=auto -o ControlPersist=yes" , Params "-o ControlMaster=auto -o ControlPersist=yes"
] ]
{- ssh connection caching creates sockets, so will not work on a {- ssh connection caching creates sockets, so will not work on all file
- crippled filesystem. A GIT_ANNEX_TMP_DIR can be provided to use - systems. A GIT_ANNEX_TMP_DIR can be provided to use
- a different filesystem. -} - a different filesystem. -}
sshCacheDir :: Annex (Maybe FilePath) sshCacheDir :: Annex (Maybe FilePath)
sshCacheDir sshCacheDir
| SysConfig.sshconnectioncaching = ifM crippledFileSystem | SysConfig.sshconnectioncaching =
( maybe (return Nothing) usetmpdir =<< gettmpdir ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig)
, ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig)
( Just <$> fromRepo gitAnnexSshDir ( Just <$> fromRepo gitAnnexSshDir
, return Nothing , maybe (return Nothing) usetmpdir =<< gettmpdir
)
) )
| otherwise = return Nothing | otherwise = return Nothing
where where

1
debian/changelog vendored
View file

@ -31,6 +31,7 @@ git-annex (4.20130602) UNRELEASED; urgency=low
* annex.debug can now be set to enable debug logging by default. * annex.debug can now be set to enable debug logging by default.
The webapp's debugging check box does this. The webapp's debugging check box does this.
* fsck: Avoid getting confused by Windows path separators * 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 -- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400