From: Malcolm.Wallace@cs.york.ac.uk <unknown>
Date: Tue, 5 Aug 2008 15:52:53 +0000 (+0000)
Subject: fixup for change of exception types in nhc98
X-Git-Tag: 6_10_branch_has_been_forked~9
X-Git-Url: http://git.megacz.com/?p=haskell-directory.git;a=commitdiff_plain;h=86de54a94584040f82980759c30338289db10f52

fixup for change of exception types in nhc98
---

diff --git a/System/Directory.hs b/System/Directory.hs
index 1df632f..2ffd49b 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -545,8 +545,8 @@ copyFile :: FilePath -> FilePath -> IO ()
 #ifdef __NHC__
 copyFile fromFPath toFPath =
     do readFile fromFPath >>= writeFile toFPath
-       try (copyPermissions fromFPath toFPath)
-       return ()
+       Prelude.catch (copyPermissions fromFPath toFPath)
+                     (\_ -> return ())
 #else
 copyFile fromFPath toFPath =
     copy `Prelude.catch` (\exc -> throw $ ioeSetLocation exc "copyFile")
@@ -1038,7 +1038,7 @@ getTemporaryDirectory = do
     `Prelude.catch` \e -> if isDoesNotExistError e then return "/tmp"
                           else throw e
 #else
-    `catch` (\ex -> return "/tmp")
+    `Prelude.catch` (\ex -> return "/tmp")
 #endif
 #endif