diff options
Diffstat (limited to 'Annex/Ssh.hs')
| -rw-r--r-- | Annex/Ssh.hs | 11 |
1 files changed, 6 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" |