diff options
author | Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-01-27 17:00:32 -0400 |
commit | 167523f09d48777f3a5931fdcbc21b9d363e0e6c (patch) | |
tree | 698c1c601b39b617ccc02259053c3c39372ed5db /Remotes.hs | |
parent | 6be516ae3bddb8f05ea62661019836e03be12a2c (diff) |
better directory handling
Rename Locations functions for better consitency, and make their values
more consistent too.
Used </> rather than manually building paths. There are still more places
that manually do so, but are tricky, due to the behavior of </> when
the second FilePath is absolute. So I only changed places where
it obviously was relative.
Diffstat (limited to 'Remotes.hs')
-rw-r--r-- | Remotes.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Remotes.hs b/Remotes.hs index be4c1383a..616db225e 100644 --- a/Remotes.hs +++ b/Remotes.hs @@ -225,7 +225,7 @@ byName name = do {- Tries to copy a key's content from a remote's annex to a file. -} copyFromRemote :: Git.Repo -> Key -> FilePath -> Annex Bool copyFromRemote r key file - | not $ Git.repoIsUrl r = liftIO $ copyFile (annexLocation r key) file + | not $ Git.repoIsUrl r = liftIO $ copyFile (gitAnnexLocation r key) file | Git.repoIsSsh r = rsynchelper r True key file | otherwise = error "copying from non-ssh repo not supported" @@ -234,7 +234,7 @@ copyToRemote :: Git.Repo -> Key -> Annex Bool copyToRemote r key | not $ Git.repoIsUrl r = do g <- Annex.gitRepo - let keysrc = annexLocation g key + let keysrc = gitAnnexLocation g key -- run copy from perspective of remote liftIO $ do a <- Annex.new r [] @@ -245,7 +245,7 @@ copyToRemote r key return ok | Git.repoIsSsh r = do g <- Annex.gitRepo - let keysrc = annexLocation g key + let keysrc = gitAnnexLocation g key rsynchelper r False key keysrc | otherwise = error "copying to non-ssh repo not supported" |