From d7337c96cf31ef0a0ff45db399cd787c778fdd28 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Aug 2015 11:21:13 -0400 Subject: refactor --- Remote/Helper/Special.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Remote') diff --git a/Remote/Helper/Special.hs b/Remote/Helper/Special.hs index 956d48273..60bf123a5 100644 --- a/Remote/Helper/Special.hs +++ b/Remote/Helper/Special.hs @@ -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 -- cgit v1.2.3