diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-01-07 01:14:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-01-07 01:14:27 -0400 |
| commit | 71a8278f9caea8d3e52a5d43cb60125018ec31fa (patch) | |
| tree | 554e6f76bed01f36923496dfa89319a3da963819 | |
| parent | e29d2376937691a4170498b095191a6ffefc9875 (diff) | |
bugfix: Running `move --to` with a non-ssh remote failed.
| -rw-r--r-- | Remotes.hs | 7 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Remotes.hs b/Remotes.hs index 5bb2efa55..2c8cdfdad 100644 --- a/Remotes.hs +++ b/Remotes.hs @@ -249,8 +249,11 @@ copyToRemote r key | not $ Git.repoIsUrl r = do g <- Annex.gitRepo let keysrc = annexLocation g key - let keydest = annexLocation r key - liftIO $ copyFile keysrc keydest + -- run copy from perspective of remote + liftIO $ do + a <- Annex.new r [] + Annex.eval a $ Core.getViaTmp key $ \f -> + liftIO $ copyFile keysrc f | Git.repoIsSsh r = do g <- Annex.gitRepo let keysrc = annexLocation g key diff --git a/debian/changelog b/debian/changelog index 150268c9d..969935a4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ git-annex (0.16) UNRELEASED; urgency=low significant problem, since the remote *did* record that it had the file. * Also, add a general guard to detect attempts to record information about repositories with missing UUIDs. + * bugfix: Running `move --to` with a non-ssh remote failed. * Test suite improvements. Current top-level test coverage: 57% -- Joey Hess <joeyh@debian.org> Tue, 04 Jan 2011 17:33:42 -0400 |