From 7ae5d7034e9d801c301615ae312eb4bcf7496166 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 7 Nov 2012 14:30:42 +0100
Subject: [PATCH] One more ghc 7.6 fix
This is only in master, so needed to be fixed separately.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
htools/Ganeti/Luxi.hs | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/htools/Ganeti/Luxi.hs b/htools/Ganeti/Luxi.hs
index 4e5c505c2..7531d7cad 100644
--- a/htools/Ganeti/Luxi.hs
+++ b/htools/Ganeti/Luxi.hs
@@ -58,7 +58,6 @@ import qualified Data.ByteString as B
import qualified Data.ByteString.UTF8 as UTF8
import Data.Word (Word8)
import Control.Monad
-import Prelude hiding (catch)
import Text.JSON (encodeStrict, decodeStrict)
import qualified Text.JSON as J
import Text.JSON.Pretty (pp_value)
@@ -291,7 +290,7 @@ recvMsg s = do
-- | Extended wrapper over recvMsg.
recvMsgExt :: Client -> IO RecvResult
recvMsgExt s =
- catch (liftM RecvOk (recvMsg s)) $ \e ->
+ Control.Exception.catch (liftM RecvOk (recvMsg s)) $ \e ->
return $ if isEOFError e
then RecvConnClosed
else RecvError (show e)
--
GitLab