This commit is contained in:
Joey Hess 2015-08-17 11:21:13 -04:00
parent 1cd3b7ddf0
commit fb9d851258
2 changed files with 17 additions and 8 deletions

View file

@ -36,6 +36,7 @@ import Common.Annex
import Types.StoreRetrieve
import Types.Remote
import Crypto
import Config
import Config.Cost
import Utility.Metered
import Remote.Helper.Chunked as X
@ -44,7 +45,6 @@ import Remote.Helper.Messages
import Annex.Content
import Messages.Progress
import qualified Git
import qualified Git.Command
import qualified Git.Construct
import qualified Data.ByteString.Lazy as L
@ -66,13 +66,10 @@ findSpecialRemotes s = do
{- Sets up configuration for a special remote in .git/config. -}
gitConfigSpecialRemote :: UUID -> RemoteConfig -> String -> String -> Annex ()
gitConfigSpecialRemote u c k v = do
set ("annex-"++k) v
set ("annex-uuid") (fromUUID u)
setConfig (remoteConfig remotename k) v
setConfig (remoteConfig remotename "uuid") (fromUUID u)
where
set a b = inRepo $ Git.Command.run
[Param "config", Param (configsetting a), Param b]
remotename = fromJust (M.lookup "name" c)
configsetting s = "remote." ++ remotename ++ "." ++ s
-- Use when nothing needs to be done to prepare a helper.
simplyPrepare :: helper -> Preparer helper