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

minor refactoring

Browse source
This commit is contained in:
Joey Hess 2013-03-30 19:05:51 -04:00
parent 553e9dc736
commit acd6a150e5
3 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Command/RecvKey.hs
View file

@ -20,8 +20,6 @@ import qualified Types.Key
import qualified Types.Backend
import qualified Backend
import System.Console.GetOpt
def :: [Command]
def = [noCommit $ command "recvkey" paramKey seek
SectionPlumbing "runs rsync in server mode to receive content"]
@ -44,8 +42,8 @@ start key = ifM (inAnnex key)
)
where
go tmp = do
(opts,_,_) <- getOpt Permute rsyncSafeOptions <$>
maybe [] words <$> getField "RsyncOptions"
opts <- filterRsyncSafeOptions . maybe [] words
<$> getField "RsyncOptions"
ifM (liftIO $ rsyncServerReceive (map Param opts) tmp)
( ifM (isJust <$> Fields.getField Fields.direct)
( directcheck tmp

6
Command/SendKey.hs
View file

@ -16,8 +16,6 @@ import Logs.Transfer
import qualified Fields
import Utility.Metered
import System.Console.GetOpt
def :: [Command]
def = [noCommit $ command "sendkey" paramKey seek
SectionPlumbing "runs rsync in server mode to send content"]
@ -27,8 +25,8 @@ seek = [withKeys start]
start :: Key -> CommandStart
start key = do
(opts,_,_) <- getOpt Permute rsyncSafeOptions <$>
maybe [] words <$> getField "RsyncOptions"
opts <- filterRsyncSafeOptions . maybe [] words
<$> getField "RsyncOptions"
ifM (inAnnex key)
( fieldTransfer Upload key $ \_p ->
sendAnnex key rollback $ liftIO . rsyncServerSend (map Param opts)