summaryrefslogtreecommitdiff
path: root/Remote/S3.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-29 13:49:54 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-29 14:10:12 -0400
commit05751d55cd8002e6a2a2afc520622fb6697472e3 (patch)
tree6a86d2ebfd6888f611d86ec33984ab512d28e087 /Remote/S3.hs
parenta3b6586902d6689b07c050b1fc50e19f4115c42e (diff)
clean up remote.log handling
Diffstat (limited to 'Remote/S3.hs')
-rw-r--r--Remote/S3.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs
index 4aa1bc639..7971faa8f 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -12,7 +12,7 @@ import Network.AWS.S3Object
import Network.AWS.S3Bucket
import Network.AWS.AWSResult
import qualified Data.ByteString.Lazy.Char8 as L
-import qualified Data.Map as Map
+import qualified Data.Map as M
import Data.String.Utils
import Control.Monad (filterM, liftM, when)
import Control.Monad.State (liftIO)
@@ -51,8 +51,8 @@ gen = do
findS3Remotes :: Git.Repo -> [Git.Repo]
findS3Remotes r = map construct remotepairs
where
- remotepairs = Map.toList $ filterremotes $ Git.configMap r
- filterremotes = Map.filterWithKey (\k _ -> s3remote k)
+ remotepairs = M.toList $ filterremotes $ Git.configMap r
+ filterremotes = M.filterWithKey (\k _ -> s3remote k)
construct (k,_) = Git.repoRemoteNameSet Git.repoFromUnknown k
s3remote k = startswith "remote." k && endswith ".annex-s3-bucket" k
@@ -68,7 +68,6 @@ genRemote r u = do
removeKey = error "TODO",
hasKey = error "TODO",
hasKeyCheap = False,
- hasConfig = True,
config = Nothing,
setup = \_ -> return ()
}