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

quiet calls to transferkey

Browse source
This commit is contained in:
Joey Hess 2012-09-24 13:36:05 -04:00
parent 3887432c54
commit 96b0e3d6e9
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Assistant/Threads/Transferrer.hs
View file

@ -74,6 +74,7 @@ startTransfer st dstatus program t info = case (transferRemote info, associatedF
where where
params = params =
[ Param "transferkey" [ Param "transferkey"
, Param "--quiet"
, Param $ key2file $ transferKey t , Param $ key2file $ transferKey t
, Param $ if isdownload , Param $ if isdownload
then "--from" then "--from"

7
Command/TransferKey.hs
View file

@ -42,7 +42,7 @@ start to from file key =
_ -> error "specify either --from or --to" _ -> error "specify either --from or --to"
toPerform :: Remote -> Key -> AssociatedFile -> CommandPerform toPerform :: Remote -> Key -> AssociatedFile -> CommandPerform
toPerform remote key file = next $ toPerform remote key file = go $
upload (uuid remote) key file forwardRetry $ \p -> do upload (uuid remote) key file forwardRetry $ \p -> do
ok <- Remote.storeKey remote key file p ok <- Remote.storeKey remote key file p
when ok $ when ok $
@ -50,6 +50,9 @@ toPerform remote key file = next $
return ok return ok
fromPerform :: Remote -> Key -> AssociatedFile -> CommandPerform fromPerform :: Remote -> Key -> AssociatedFile -> CommandPerform
fromPerform remote key file = next $ fromPerform remote key file = go $
download (uuid remote) key file forwardRetry $ download (uuid remote) key file forwardRetry $
getViaTmp key $ Remote.retrieveKeyFile remote key file getViaTmp key $ Remote.retrieveKeyFile remote key file
go :: Annex Bool -> CommandPerform
go a = ifM a ( liftIO exitSuccess, liftIO exitFailure)