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 /Annex/Ingest.hs | |
| parent | aa5de5e25c46cbf5c0eb2cd6e0fb6e84be5586fb (diff) | |
| parent | cd8e2e4eeb70d22f9a7daa375474d80aa188574b (diff) | |
Merge branch 'no-cbits'
Diffstat (limited to 'Annex/Ingest.hs')
| -rw-r--r-- | Annex/Ingest.hs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Annex/Ingest.hs b/Annex/Ingest.hs index a7f36466f..b80f0e1e0 100644 --- a/Annex/Ingest.hs +++ b/Annex/Ingest.hs @@ -5,8 +5,6 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP #-} - module Annex.Ingest ( LockedDown(..), LockDownConfig(..), @@ -42,13 +40,9 @@ import Utility.InodeCache import Annex.ReplaceFile import Utility.Tmp import Utility.CopyFile +import Utility.Touch import Git.FilePath import Annex.InodeSentinal -#ifdef WITH_CLIBS -#ifndef __ANDROID__ -import Utility.Touch -#endif -#endif import Control.Exception (IOException) @@ -282,11 +276,7 @@ makeLink file key mcache = flip catchNonAsync (restoreFile file key) $ do -- touch symlink to have same time as the original file, -- as provided in the InodeCache case mcache of -#if defined(WITH_CLIBS) && ! defined(__ANDROID__) Just c -> liftIO $ touch file (TimeSpec $ inodeCacheToMtime c) False -#else - Just _ -> noop -#endif Nothing -> noop return l |