diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-06 14:29:01 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-06 14:29:01 -0400 |
| commit | a6cd089cea9b2e6d12461f02ca7fbef9b12d403c (patch) | |
| tree | 5a6ed63807b8b012f42f8f8f2ab6da5e5883d342 /Remote/Directory.hs | |
| parent | 3bac971ac22afd706d7ad52013c86a7dae80c684 (diff) | |
Fix transferring files to special remotes in direct mode.
Diffstat (limited to 'Remote/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 12875770f..1273c2d64 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -111,8 +111,7 @@ withStoredFiles :: ChunkSize -> FilePath -> Key -> ([FilePath] -> IO Bool) -> IO withStoredFiles = withCheckedFiles doesFileExist store :: FilePath -> ChunkSize -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool -store d chunksize k _f p = do - src <- inRepo $ gitAnnexLocation k +store d chunksize k _f p = sendAnnex k $ \src -> metered (Just p) k $ \meterupdate -> storeHelper d chunksize k $ \dests -> case chunksize of @@ -126,8 +125,7 @@ store d chunksize k _f p = do =<< L.readFile src storeEncrypted :: FilePath -> ChunkSize -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool -storeEncrypted d chunksize (cipher, enck) k p = do - src <- inRepo $ gitAnnexLocation k +storeEncrypted d chunksize (cipher, enck) k p = sendAnnex k $ \src -> metered (Just p) k $ \meterupdate -> storeHelper d chunksize enck $ \dests -> encrypt cipher (feedFile src) $ readBytes $ \b -> |