confsolve 0.3.7 → 0.3.8

raw patch · 5 files changed

+11/−9 lines, 5 files

Files

ConfsolveArgs.hs +1/−1
ParseInput.hs +5/−4
Utils.hs +2/−1
confsolve.cabal +2/−1
confsolve.hs +1/−2

ConfsolveArgs.hs view

@@ -19,7 +19,7 @@    &= helpArg [explicit, name "help", name "h"]    &= versionArg [explicit, name "version", name "v", summary versionInfo ] -versionInfo = "confsolve version 0.3.7"+versionInfo = "confsolve version 0.3.8" summaryInfo = ""  confsolveArgs :: IO Confsolve

ParseInput.hs view

@@ -1,3 +1,4 @@+{-# LANGUAGE PatternGuards #-}  module ParseInput where import Data.Char (toLower)@@ -47,8 +48,8 @@   parseInts :: String -> [Int]-parseInts str = go str []+parseInts str = go str    where-      go str ints-         | [(int, rest)] <- reads str :: [(Int, String)] = go rest (ints ++ [int])-         | otherwise                                     = ints+      go str+         | [(int, rest)] <- reads str :: [(Int, String)] = int : go rest+         | otherwise                                     = []

Utils.hs view

@@ -5,6 +5,7 @@ import System.Environment import Data.Time.Clock import Data.Time.Calendar+import qualified Control.Exception as E import Control.Exception.Base (try) import qualified Data.Text as T import qualified Filesystem as FS@@ -13,7 +14,7 @@  errorsToStderr :: IO () -> IO () errorsToStderr action =-   catch action (\e -> appPutStrLn stderr (show e))+   E.catch action (\(e :: E.SomeException) -> appPutStrLn stderr (show e))  appPutStrLn :: Handle -> String -> IO () appPutStrLn handle string = do

confsolve.cabal view

@@ -1,5 +1,5 @@ Name:          confsolve-Version:       0.3.7+Version:       0.3.8 License:       BSD3 License-file:  LICENSE Author:        Daniel Trstenjak@@ -7,6 +7,7 @@ Build-Type:    Simple Category:      Utils Cabal-Version: >=1.6+Tested-With:   GHC==7.6.2 Synopsis:      A command line tool for resolving conflicts of file synchronizers. Description:   A command line tool for resolving conflicts of file synchronizers.

confsolve.hs view

@@ -11,9 +11,8 @@ import qualified Data.Text as T import qualified Filesystem.Path.CurrentOS as FP import Filesystem.Path.CurrentOS ((</>))-import Control.Monad (mapM_, when)+import Control.Monad (mapM_, when, void) import Control.Applicative ((<$>))-import Foreign.Marshal.Error (void) import qualified FileConflict as FC import qualified Dropbox.Conflict as DB import qualified Wuala.Conflict as WU