diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-18 13:36:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-18 13:36:12 -0400 |
| commit | 293903ba38209a1e574ab6a929872ac5c31dfaf4 (patch) | |
| tree | 9c0d49fbb06ee2b656834ddd01c6edd8f3f5f7ec /Remote | |
| parent | e770543c1010526d98730112d58ed304ab4ea341 (diff) | |
Fix fsck --from a git remote in a local directory, and from a directory special remote. This was a reversion caused by the relative path changes in 5.20150113.
The directory special remote was not affected in its normal configuration,
since annex-directory is an absolute path normally. But it could fail
when a relative path was used.
The git remote was affected even when an absolute path to it was used in
.git/config, since git-annex now converts all such paths to relative.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Directory.hs | 10 | ||||
| -rw-r--r-- | Remote/Git.hs | 13 |
2 files changed, 17 insertions, 6 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 2eeb79317..916013172 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 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 diff --git a/Remote/Git.hs b/Remote/Git.hs index abefc113e..fdd0049ca 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -445,10 +445,17 @@ copyFromRemote' r key file dest copyFromRemoteCheap :: Remote -> Key -> FilePath -> Annex Bool #ifndef mingw32_HOST_OS copyFromRemoteCheap r key file - | not $ Git.repoIsUrl (repo r) = guardUsable (repo r) (return False) $ do - loc <- liftIO $ gitAnnexLocation key (repo r) $ + | not $ Git.repoIsUrl (repo r) = guardUsable (repo r) (return False) $ liftIO $ do + loc <- gitAnnexLocation key (repo r) $ fromJust $ remoteGitConfig $ gitconfig r - liftIO $ catchBoolIO $ createSymbolicLink loc file >> return True + ifM (doesFileExist loc) + ( do + absloc <- absPath loc + catchBoolIO $ do + createSymbolicLink absloc file + return True + , return False + ) | Git.repoIsSsh (repo r) = ifM (Annex.Content.preseedTmp key file) ( copyFromRemote' r key Nothing file |