diff options
| author | Daniel Wagner <daniel@wagner-home.com> | 2011-07-31 19:08:50 +0200 |
|---|---|---|
| committer | Daniel Wagner <daniel@wagner-home.com> | 2011-07-31 19:08:50 +0200 |
| commit | 39f010d82d0292d9417a06abaf91dabb43ea3ef4 (patch) | |
| tree | 1c701e3b4781a6460131c9e28e2705d8fb923f64 /XMonad/Prompt/Ssh.hs | |
| parent | 3eae9324c087da3fae57f2dcd9181eb850f12c1a (diff) | |
| download | XMonadContrib-39f010d82d0292d9417a06abaf91dabb43ea3ef4.tar.gz XMonadContrib-39f010d82d0292d9417a06abaf91dabb43ea3ef4.tar.xz XMonadContrib-39f010d82d0292d9417a06abaf91dabb43ea3ef4.zip | |
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
Diffstat (limited to 'XMonad/Prompt/Ssh.hs')
| -rw-r--r-- | XMonad/Prompt/Ssh.hs | 8 |
1 files changed, 7 insertions, 1 deletions
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" |