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

avoid needing a build-dep on hxt for Data.AssocList

Browse source
This commit is contained in:
Joey Hess 2014-01-14 16:42:10 -04:00
parent d0b51099a4
commit 207ac67aaa
6 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Remote/Git.hs
View file

@ -54,7 +54,6 @@ import Control.Concurrent
import Control.Concurrent.MSampleVar
import System.Process (std_in, std_err)
import qualified Data.Map as M
import qualified Data.AssocList as A
import Control.Exception.Extensible
remote :: RemoteType
@ -417,7 +416,7 @@ fsckOnRemote r params
program <- readProgramFile
r' <- Git.Config.read r
env <- getEnvironment
let env' = A.addEntries
let env' = addEntries
[ ("GIT_WORK_TREE", Git.repoPath r')
, ("GIT_DIR", Git.localGitDir r')
] env

5
Remote/Glacier.hs
View file

@ -9,8 +9,6 @@ module Remote.Glacier (remote, jobList) where
import qualified Data.Map as M
import qualified Data.Text as T
import Data.AssocList as A
import System.Environment
import Common.Annex
import Types.Remote
@ -27,6 +25,7 @@ import Utility.Metered
import qualified Annex
import Annex.Content
import Annex.UUID
import Utility.Env
import System.Process
@ -233,7 +232,7 @@ glacierEnv c u = go =<< getRemoteCredPairFor "glacier" c creds
go Nothing = return Nothing
go (Just (user, pass)) = do
e <- liftIO getEnvironment
return $ Just $ A.addEntries [(uk, user), (pk, pass)] e
return $ Just $ addEntries [(uk, user), (pk, pass)] e
creds = AWS.creds u
(uk, pk) = credPairEnvironment creds

5
Remote/Hook.hs
View file

@ -9,8 +9,6 @@ module Remote.Hook (remote) where
import qualified Data.ByteString.Lazy as L
import qualified Data.Map as M
import qualified Data.AssocList as A
import System.Environment
import Common.Annex
import Types.Remote
@ -24,6 +22,7 @@ import Remote.Helper.Special
import Remote.Helper.Encryptable
import Crypto
import Utility.Metered
import Utility.Env
type Action = String
type HookName = String
@ -78,7 +77,7 @@ hookSetup mu c = do
hookEnv :: Action -> Key -> Maybe FilePath -> IO (Maybe [(String, String)])
hookEnv action k f = Just <$> mergeenv (fileenv f ++ keyenv)
where
mergeenv l = A.addEntries l <$> getEnvironment
mergeenv l = addEntries l <$> getEnvironment
env s v = ("ANNEX_" ++ s, v)
keyenv = catMaybes
[ Just $ env "KEY" (key2file k)