diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /Remote/Directory.hs | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'Remote/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index f210f557d..8b727c77e 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -162,9 +162,13 @@ retrieveCheap _ (UnpaddedChunks _) _ _ _ = return False retrieveCheap _ (LegacyChunks _) _ _ _ = return False #ifndef mingw32_HOST_OS retrieveCheap d NoChunks k _af f = liftIO $ catchBoolIO $ do - file <- getLocation d k - createSymbolicLink file f - return True + file <- absPath =<< getLocation d k + ifM (doesFileExist file) + ( do + createSymbolicLink file f + return True + , return False + ) #else retrieveCheap _ _ _ _ _ = return False #endif |