diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-14 16:35:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-14 16:35:10 -0400 |
| commit | efec2521cc14b3dec895066c9e7c16e740ab12ec (patch) | |
| tree | b60412fe4c371871f334e33bbb5e3f52b1ba0945 /Remote/Directory.hs | |
| parent | dc367b090adec9f2fc5f37cba5e9b5d5f2decbce (diff) | |
add filename to progress bar, and display ok/failed at end
This needed plumbing an AssociatedFile through retrieveKeyFileCheap.
Diffstat (limited to 'Remote/Directory.hs')
| -rw-r--r-- | Remote/Directory.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 2eeb79317..f210f557d 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -156,17 +156,17 @@ retrieve d (LegacyChunks _) = Legacy.retrieve locations d retrieve d _ = simplyPrepare $ byteRetriever $ \k sink -> sink =<< liftIO (L.readFile =<< getLocation d k) -retrieveCheap :: FilePath -> ChunkConfig -> Key -> FilePath -> Annex Bool +retrieveCheap :: FilePath -> ChunkConfig -> Key -> AssociatedFile -> FilePath -> Annex Bool -- no cheap retrieval possible for chunks -retrieveCheap _ (UnpaddedChunks _) _ _ = return False -retrieveCheap _ (LegacyChunks _) _ _ = return False +retrieveCheap _ (UnpaddedChunks _) _ _ _ = return False +retrieveCheap _ (LegacyChunks _) _ _ _ = return False #ifndef mingw32_HOST_OS -retrieveCheap d NoChunks k f = liftIO $ catchBoolIO $ do +retrieveCheap d NoChunks k _af f = liftIO $ catchBoolIO $ do file <- getLocation d k createSymbolicLink file f return True #else -retrieveCheap _ _ _ _ = return False +retrieveCheap _ _ _ _ _ = return False #endif remove :: FilePath -> Remover |