From ff220c0a05e47ff796f16b8c96bdc1751139ada4 Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 6 May 2014 20:58:09 -0400 Subject: Fixed wheezy build --- KeyRing.hs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/KeyRing.hs b/KeyRing.hs index c2e209c..0957143 100644 --- a/KeyRing.hs +++ b/KeyRing.hs @@ -134,7 +134,7 @@ import System.FilePath ( takeDirectory ) import System.IO (hPutStrLn,withFile,IOMode(..), Handle, hPutStr) import Data.IORef import System.Posix.IO ( fdToHandle ) -import qualified Data.Traversable as Traversable ( mapM ) +import qualified Data.Traversable as Traversable import Data.Traversable ( sequenceA ) #if ! MIN_VERSION_base(4,6,0) import GHC.Exts ( Down(..) ) @@ -1238,7 +1238,11 @@ buildKeyDB ctx grip0 keyring = do -- KeyRings (todo: KikiCondition reporting?) (spilled,mwk,grip,accs,keys,unspilled) <- do +#if MIN_VERSION_containers(0,5,0) ringPackets <- Map.traverseWithKey readp ringMap +#else + ringPackets <- Traversable.traverse (uncurry readp) $ Map.mapWithKey (,) ringMap +#endif let _ = ringPackets :: Map.Map InputFile (StreamInfo, Message) let grip = grip0 `mplus` (fingerprint <$> fstkey) @@ -1284,7 +1288,11 @@ buildKeyDB ctx grip0 keyring = do r <- performManipulations doDecrypt rt1 mwk manip try r $ \(rt2,report) -> do return $ KikiSuccess (report,(info,flattenKeys acc $ rtKeyDB rt2)) +#if MIN_VERSION_containers(0,5,0) in fmap sequenceA $ Map.traverseWithKey trans spilled +#else + in fmap sequenceA $ Traversable.traverse (uncurry trans) $ Map.mapWithKey (,) spilled +#endif try transformed0 $ \transformed -> do let db_rings = Map.foldlWithKey' mergeIt Map.empty transformed where @@ -2404,7 +2412,8 @@ readPacketsFromFile ctx fname = do case decodeOrFail input of Right (_,_,msg ) -> msg Left (_,_,_) -> - --trace (fname++": read fail") $ + -- FIXME + -- trace (fname++": read fail") $ Message [] #else return $ decode input -- cgit v1.2.3