diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-05 11:22:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-05 11:22:32 -0400 |
| commit | 80de75d25c19f37564ac6db97db534f40d26f108 (patch) | |
| tree | 0ccf8611ba4fdfdccb6f90cee16c76a481d9feaa /Command | |
| parent | aa5de5e25c46cbf5c0eb2cd6e0fb6e84be5586fb (diff) | |
| parent | cd8e2e4eeb70d22f9a7daa375474d80aa188574b (diff) | |
Merge branch 'no-cbits'
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Fix.hs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Command/Fix.hs b/Command/Fix.hs index 5565a6837..d87bea358 100644 --- a/Command/Fix.hs +++ b/Command/Fix.hs @@ -18,11 +18,7 @@ import Annex.Content import Annex.Perms import qualified Annex.Queue import qualified Database.Keys -#ifdef WITH_CLIBS -#ifndef __ANDROID__ import Utility.Touch -#endif -#endif cmd :: Command cmd = notDirect $ noCommit $ withGlobalOptions annexedMatchingOptions $ @@ -90,21 +86,17 @@ makeHardLink file key = do fixSymlink :: FilePath -> FilePath -> CommandPerform fixSymlink file link = do liftIO $ do -#ifdef WITH_CLIBS -#ifndef __ANDROID__ +#if ! defined(mingw32_HOST_OS) && ! defined(__ANDROID__) -- preserve mtime of symlink mtime <- catchMaybeIO $ TimeSpec . modificationTime <$> getSymbolicLinkStatus file #endif -#endif createDirectoryIfMissing True (parentDir file) removeFile file createSymbolicLink link file -#ifdef WITH_CLIBS -#ifndef __ANDROID__ +#if ! defined(mingw32_HOST_OS) && ! defined(__ANDROID__) maybe noop (\t -> touch file t False) mtime #endif -#endif next $ cleanupSymlink file cleanupSymlink :: FilePath -> CommandCleanup |