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

Fix bug that prevented annex.sshcaching=false configuration from taking effect when on a crippled filesystem. Thanks, divergentdave.

Browse source
This commit is contained in:
Joey Hess 2016-04-20 14:43:43 -04:00
parent da4ff16805
commit b56218f0c2
Failed to extract signature
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Annex/Ssh.hs
View file

@ -101,13 +101,14 @@ sshConnectionCachingParams socketfile =
- 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) ( ifM crippledFileSystem
( Just <$> fromRepo gitAnnexSshDir ( maybe (return Nothing) usetmpdir =<< gettmpdir
, Just <$> fromRepo gitAnnexSshDir
)
, return Nothing , return Nothing
) )
)
| otherwise = return Nothing | otherwise = return Nothing
where where
gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR" gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR"

2
debian/changelog vendored
View file

@ -8,6 +8,8 @@ git-annex (6.20160419) UNRELEASED; urgency=medium
instead of deleting it. instead of deleting it.
* calckey: New plumbing command, calculates the key that would be used * calckey: New plumbing command, calculates the key that would be used
to refer to a file. to refer to a file.
* Fix bug that prevented annex.sshcaching=false configuration from taking
effect when on a crippled filesystem. Thanks, divergentdave.
-- Joey Hess <id@joeyh.name> Tue, 19 Apr 2016 12:57:15 -0400 -- Joey Hess <id@joeyh.name> Tue, 19 Apr 2016 12:57:15 -0400

10
doc/bugs/Android_6.0_compatibility/comment_6_a4ef9eb27285aa68d6edc14e30627ebf._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="joey"
subject="""comment 6"""
date="2016-04-20T18:40:57Z"
content="""
Thanks, divergentdave for spotting that and also for writing a fix.
I've finally noticed your comment and put the fix in. It would probably be
good to open a todo if you have a patch in the future, to make sure it
doesn't get forgotten about.
"""]]