Commit a5896c2b authored by Bas Lijnse's avatar Bas Lijnse

HOTFIX addition to MR !536. Added what looks like forgotten replacement

of copyFile` by 'SF'.copyFile and conversions from OSError to String.
parent acbf87c0
Pipeline #48321 passed with stages
in 13 minutes and 4 seconds
......@@ -30,7 +30,7 @@ moveFile :: !FilePath !FilePath -> Task ()
moveFile srcPath dstPath = accWorldError ('SF'.moveFile srcPath dstPath) (addExplanation ["Failed to move ",srcPath," to ",dstPath])
copyFile :: !FilePath !FilePath -> Task ()
copyFile srcPath dstPath = accWorldError ('SF'.copyFile srcPath dstPath) (\e -> concat ["Failed to copy ",srcPath," to ",dstPath,": ",e])
copyFile srcPath dstPath = accWorldError ('SF'.copyFile srcPath dstPath) (\e -> concat ["Failed to copy ",srcPath," to ",dstPath,": ",snd e])
createDirectory :: !FilePath !Bool -> Task ()
createDirectory path False = accWorldError ('SD'.createDirectory path) (addExplanation ["Failed to create directory ",path])
......@@ -99,8 +99,8 @@ where
| directory = case copyDirectory` (srcPath </> entry) (dstPath </> entry) world of
(Error e,world) = (Error (concat (expl ++ [e])),world)
(Ok (),world) = copyContent rest world
| otherwise = case copyFile` (srcPath </> entry) (dstPath </> entry) world of
(Error e,world) = (Error (concat (expl ++ [e])), world)
| otherwise = case 'SF'.copyFile (srcPath </> entry) (dstPath </> entry) world of
(Error e,world) = (Error (concat (expl ++ [snd e])), world)
(Ok (),world) = copyContent rest world
addExplanation :: ![String] !OSError -> String
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment