From 39f010d82d0292d9417a06abaf91dabb43ea3ef4 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Sun, 31 Jul 2011 19:08:50 +0200 Subject: GHC 7 compat Ignore-this: 17a43a709e70ebccc925e016d7057399 * true error: more modules export foldl/foldl'/foldr, so explicitly use the Data.Foldable one * -Werror error: transition from Control.OldException to Control.Exception, assuming everything was IOException darcs-hash:20110731170850-76d51-71271524485f6d10f84521f271182bea5085d400.gz --- XMonad/Prompt/Ssh.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'XMonad/Prompt/Ssh.hs') diff --git a/XMonad/Prompt/Ssh.hs b/XMonad/Prompt/Ssh.hs index 122c137..7d84069 100644 --- a/XMonad/Prompt/Ssh.hs +++ b/XMonad/Prompt/Ssh.hs @@ -18,16 +18,22 @@ module XMonad.Prompt.Ssh sshPrompt ) where +import Prelude hiding (catch) + import XMonad import XMonad.Util.Run import XMonad.Prompt import System.Directory import System.Environment +import Control.Exception import Control.Monad import Data.Maybe +econst :: Monad m => a -> IOException -> m a +econst = const . return + -- $usage -- 1. In your @~\/.xmonad\/xmonad.hs@: -- @@ -71,7 +77,7 @@ sshComplListLocal = do sshComplListGlobal :: IO [String] sshComplListGlobal = do - env <- getEnv "SSH_KNOWN_HOSTS" `catch` (\_ -> return "/nonexistent") + env <- getEnv "SSH_KNOWN_HOSTS" `catch` econst "/nonexistent" fs <- mapM fileExists [ env , "/usr/local/etc/ssh/ssh_known_hosts" , "/usr/local/etc/ssh_known_hosts" -- cgit v1.2.3