From 01acb5212ecbdf01c32e18f0f569dbab0b37ea18 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Mar 2020 12:29:40 -0400 Subject: [PATCH] fix build --- Command/Fix.hs | 15 +++++++-------- Command/Fsck.hs | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Command/Fix.hs b/Command/Fix.hs index 5affc0590c..1a92dc5797 100644 --- a/Command/Fix.hs +++ b/Command/Fix.hs @@ -88,17 +88,16 @@ makeHardLink file key = do fixSymlink :: FilePath -> FilePath -> CommandPerform fixSymlink file link = do - liftIO $ do #if ! defined(mingw32_HOST_OS) - -- preserve mtime of symlink - mtime <- catchMaybeIO $ modificationTimeHiRes - <$> getSymbolicLinkStatus file + -- preserve mtime of symlink + mtime <- liftIO $ catchMaybeIO $ modificationTimeHiRes + <$> getSymbolicLinkStatus file #endif - createWorkTreeDirectory (parentDir file) - removeFile file - createSymbolicLink link file + createWorkTreeDirectory (parentDir file) + liftIO $ removeFile file + liftIO $ createSymbolicLink link file #if ! defined(mingw32_HOST_OS) - maybe noop (\t -> touch file t False) mtime + liftIO $ maybe noop (\t -> touch file t False) mtime #endif next $ cleanupSymlink file diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 5d9d109856..434e8b92cd 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -219,7 +219,7 @@ fixLink key file = do go want have | want /= fromRawFilePath (fromInternalGitPath have) = do showNote "fixing link" - liftIO $ createWorkTreeDirectory (parentDir (fromRawFilePath file)) + createWorkTreeDirectory (parentDir (fromRawFilePath file)) liftIO $ removeFile (fromRawFilePath file) addAnnexLink want file | otherwise = noop