diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-20 14:43:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-20 14:43:43 -0400 |
| commit | 5c23c1c2e6904e26b49cce1c9d0a1ba718e5938f (patch) | |
| tree | 97f6a7f75f9f94ec8d55def46118936ceaf83e1e | |
| parent | 6d61a2efb27aaed0fa87dd504fb289a9f2c6ebdc (diff) | |
Fix bug that prevented annex.sshcaching=false configuration from taking effect when on a crippled filesystem. Thanks, divergentdave.
| -rw-r--r-- | Annex/Ssh.hs | 11 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/Android_6.0_compatibility/comment_6_a4ef9eb27285aa68d6edc14e30627ebf._comment | 10 |
3 files changed, 18 insertions, 5 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index a97134c79..10efa9f9e 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -101,13 +101,14 @@ sshConnectionCachingParams socketfile = - a different filesystem. -} sshCacheDir :: Annex (Maybe FilePath) sshCacheDir - | SysConfig.sshconnectioncaching = ifM crippledFileSystem - ( maybe (return Nothing) usetmpdir =<< gettmpdir - , ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig) - ( Just <$> fromRepo gitAnnexSshDir + | SysConfig.sshconnectioncaching = + ifM (fromMaybe True . annexSshCaching <$> Annex.getGitConfig) + ( ifM crippledFileSystem + ( maybe (return Nothing) usetmpdir =<< gettmpdir + , Just <$> fromRepo gitAnnexSshDir + ) , return Nothing ) - ) | otherwise = return Nothing where gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR" diff --git a/debian/changelog b/debian/changelog index 2636403e2..39743f3fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-annex (6.20160419) UNRELEASED; urgency=medium instead of deleting it. * calckey: New plumbing command, calculates the key that would be used 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 diff --git a/doc/bugs/Android_6.0_compatibility/comment_6_a4ef9eb27285aa68d6edc14e30627ebf._comment b/doc/bugs/Android_6.0_compatibility/comment_6_a4ef9eb27285aa68d6edc14e30627ebf._comment new file mode 100644 index 000000000..fb980779b --- /dev/null +++ b/doc/bugs/Android_6.0_compatibility/comment_6_a4ef9eb27285aa68d6edc14e30627ebf._comment @@ -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. +"""]] |