mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add filename to progress bar, and display ok/failed at end

Browse source 
This needed plumbing an AssociatedFile through retrieveKeyFileCheap.
This commit is contained in:
Joey Hess 2015-04-14 16:35:10 -04:00
parent dc4de7faf7
commit a2902cdaaf
21 changed files with 85 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/Fsck.hs
View file

@ -135,11 +135,11 @@ performRemote key file backend numcopies remote =
cleanup
cleanup `after` a tmp
getfile tmp =
ifM (Remote.retrieveKeyFileCheap remote key tmp)
ifM (Remote.retrieveKeyFileCheap remote key (Just file) tmp)
( return True
, ifM (Annex.getState Annex.fast)
( return False
, Remote.retrieveKeyFile remote key Nothing tmp dummymeter
, Remote.retrieveKeyFile remote key (Just file) tmp dummymeter
)
)
dummymeter _ = noop

2
Command/TestRemote.hs
View file

@ -171,7 +171,7 @@ testUnavailable st r k =
Remote.retrieveKeyFile r k Nothing dest nullMeterUpdate
, check (== Right False) "retrieveKeyFileCheap" $
getViaTmp k $ \dest ->
Remote.retrieveKeyFileCheap r k dest
Remote.retrieveKeyFileCheap r k Nothing dest
]
where
check checkval desc a = testCase desc $ do