diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-11 12:21:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-11 12:21:26 -0400 |
| commit | b15ce31aa84ac2ae3d78e82868fb6065f15c99a4 (patch) | |
| tree | 2d547c505b65e23c2e0083098f1f860782a36dfb /Command/Fix.hs | |
| parent | 028916acae51217b27de59d19f70ecc24cc2ed36 (diff) | |
| parent | f0f17dd7ff1b6220526a9c42683d7c6272598f64 (diff) | |
Merge branch 'master' into adjustedbranch
Diffstat (limited to 'Command/Fix.hs')
| -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 |