diff options
author | James Crayne <jim.crayne@gmail.com> | 2014-05-06 20:43:29 -0400 |
---|---|---|
committer | James Crayne <jim.crayne@gmail.com> | 2014-05-06 20:43:29 -0400 |
commit | f751f74f213f968e7d56b73e9058a62f9fa87d3f (patch) | |
tree | 013bdf9a85b619bc76a93ccb665d68dd2dff69f8 /KeyRing.hs | |
parent | cd074ee590e82bfc9449072c78c97db2d3c1e064 (diff) | |
parent | c3e54b0c9a274ed411294848d98c72fe3c204888 (diff) |
Merge branch 'master' of jotunheim:samizdat/kiki
Diffstat (limited to 'KeyRing.hs')
-rw-r--r-- | KeyRing.hs | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -139,6 +139,9 @@ import Data.Traversable ( sequenceA ) | |||
139 | #if ! MIN_VERSION_base(4,6,0) | 139 | #if ! MIN_VERSION_base(4,6,0) |
140 | import GHC.Exts ( Down(..) ) | 140 | import GHC.Exts ( Down(..) ) |
141 | #endif | 141 | #endif |
142 | #if MIN_VERSION_binary(0,7,0) | ||
143 | import Debug.Trace | ||
144 | #endif | ||
142 | import Network.Socket -- (SockAddr) | 145 | import Network.Socket -- (SockAddr) |
143 | import qualified Data.ByteString.Lazy.Char8 as Char8 | 146 | import qualified Data.ByteString.Lazy.Char8 as Char8 |
144 | 147 | ||
@@ -2400,7 +2403,9 @@ readPacketsFromFile ctx fname = do | |||
2400 | return $ | 2403 | return $ |
2401 | case decodeOrFail input of | 2404 | case decodeOrFail input of |
2402 | Right (_,_,msg ) -> msg | 2405 | Right (_,_,msg ) -> msg |
2403 | Left (_,_,_) -> trace (fname++": read fail") $ Message [] | 2406 | Left (_,_,_) -> |
2407 | --trace (fname++": read fail") $ | ||
2408 | Message [] | ||
2404 | #else | 2409 | #else |
2405 | return $ decode input | 2410 | return $ decode input |
2406 | #endif | 2411 | #endif |