summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYoshikuniJujo <>2013-09-11 03:57:53 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2013-09-11 03:57:53 (GMT)
commit187061ad45b2f1c5ccd7808a8884535898157ab8 (patch)
treee55ffb1183ee122964290b54f53ac5ad842afe2d
parentba76160c1887acd4b6227475a42dac718a8a0991 (diff)
version 0.0.2HEAD0.0.2master
-rw-r--r--src/Network/Yjftp.hs5
-rw-r--r--yjftp-libs.cabal4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Network/Yjftp.hs b/src/Network/Yjftp.hs
index a946277..5bbf81e 100644
--- a/src/Network/Yjftp.hs
+++ b/src/Network/Yjftp.hs
@@ -14,7 +14,7 @@ import System.Environment (getArgs)
import System.Posix.IO (stdOutput)
import System.Posix.Terminal(getTerminalAttributes, setTerminalAttributes, withoutMode,
TerminalState(Immediately), TerminalMode(EnableEcho))
-import Control.OldException (catch, Exception)
+import Control.Exception (catch, SomeException)
import Control.Monad (when, unless)
import Control.Applicative ((<$>))
import Prelude hiding (catch)
@@ -63,7 +63,8 @@ connectNlogin mAddr mUsr pswd =
psswd <- getPassword
login h usr (Just psswd) Nothing
-tryNTimes :: Int -> (Exception -> IO a) -> IO b -> IO b
+-- tryNTimes :: Int -> (Exception -> IO a) -> IO b -> IO b
+tryNTimes :: Int -> (SomeException -> IO a) -> IO b -> IO b
tryNTimes 0 _ _ = exitFailure
tryNTimes n errM act
= if (n < 0) then error "tryNTimes: bad! minus times trial?"
diff --git a/yjftp-libs.cabal b/yjftp-libs.cabal
index 3f3d74e..884ca77 100644
--- a/yjftp-libs.cabal
+++ b/yjftp-libs.cabal
@@ -1,5 +1,5 @@
Name: yjftp-libs
-Version: 0.0.1
+Version: 0.0.2
License: GPL
License-file: LICENSE
Author: Yoshikuni Jujo
@@ -37,7 +37,7 @@ Extra-Tmp-Files:
Library
Hs-source-dirs: src
GHC-Options: -Wall
- Build-Depends: base >= 4 && < 4.6, unix, directory, process, ftphs, mtl
+ Build-Depends: base >= 4 && < 4.7, unix, directory, process, ftphs, mtl
Exposed-Modules: Network.Yjftp
Executable yjftp-ni