diff options
author | Joey Hess <joey@kitenet.net> | 2014-01-14 16:42:10 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-01-14 16:42:10 -0400 |
commit | 619e567cc8b59b549f70c95357455ac95fec942d (patch) | |
tree | 3f17722168b5bc9844b2c86dde80dab854ded548 /Remote/Glacier.hs | |
parent | b52ce804b084b9c182756bb6df944f0604b26f5b (diff) |
avoid needing a build-dep on hxt for Data.AssocList
Diffstat (limited to 'Remote/Glacier.hs')
-rw-r--r-- | Remote/Glacier.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs index f0ff8d738..3bb92e2f6 100644 --- a/Remote/Glacier.hs +++ b/Remote/Glacier.hs @@ -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 |