summaryrefslogtreecommitdiff
path: root/Annex/Ssh.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-05-11 18:23:41 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-05-11 18:23:41 -0400
commit618af8b6772d25ab27336d240ecddae7ae207561 (patch)
tree9e48ea32c7cbe11603ab599b5e0616457cd4de4e /Annex/Ssh.hs
parentdb56fab07ddd6910b1dc08f4fa242c267c469eb5 (diff)
clean up from windows porting
Diffstat (limited to 'Annex/Ssh.hs')
-rwxr-xr-xAnnex/Ssh.hs8
1 files changed, 1 insertions, 7 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs
index 56109774b..1f924ecad 100755
--- a/Annex/Ssh.hs
+++ b/Annex/Ssh.hs
@@ -14,9 +14,6 @@ module Annex.Ssh (
) where
import qualified Data.Map as M
-#ifndef __WINDOWS__
-import System.Posix.Env
-#endif
import Common.Annex
import Annex.LockPool
@@ -24,6 +21,7 @@ import Annex.Perms
import qualified Build.SysConfig as SysConfig
import qualified Annex
import Config
+import Utility.Env
{- Generates parameters to ssh to a given host (or user@host) on a given
- port, with connection caching. -}
@@ -78,11 +76,7 @@ sshCacheDir
)
| otherwise = return Nothing
where
-#ifndef __WINDOWS__
gettmpdir = liftIO $ getEnv "GIT_ANNEX_TMP_DIR"
-#else
- gettmpdir = return Nothing
-#endif
usetmpdir tmpdir = liftIO $ catchMaybeIO $ do
createDirectoryIfMissing True tmpdir
return tmpdir