projects
/
haskell-directory.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
12608d1
)
fixup for change of exception types in nhc98
author
Malcolm.Wallace@cs.york.ac.uk
<unknown>
Tue, 5 Aug 2008 15:52:53 +0000
(15:52 +0000)
committer
Malcolm.Wallace@cs.york.ac.uk
<unknown>
Tue, 5 Aug 2008 15:52:53 +0000
(15:52 +0000)
System/Directory.hs
patch
|
blob
|
history
diff --git
a/System/Directory.hs
b/System/Directory.hs
index
1df632f
..
2ffd49b
100644
(file)
--- 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
#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")
#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
`Prelude.catch` \e -> if isDoesNotExistError e then return "/tmp"
else throw e
#else
- `catch` (\ex -> return "/tmp")
+ `Prelude.catch` (\ex -> return "/tmp")
#endif
#endif
#endif
#endif