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 /Command | |
| parent | dc367b090adec9f2fc5f37cba5e9b5d5f2decbce (diff) | |
add filename to progress bar, and display ok/failed at end
This needed plumbing an AssociatedFile through retrieveKeyFileCheap.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Fsck.hs | 4 | ||||
| -rw-r--r-- | Command/TestRemote.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 08753b612..54f20f5e8 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -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 diff --git a/Command/TestRemote.hs b/Command/TestRemote.hs index 4a65aa4ec..b0f2c28bb 100644 --- a/Command/TestRemote.hs +++ b/Command/TestRemote.hs @@ -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 |