diff options
author | 2011-03-28 23:51:07 -0400 | |
---|---|---|
committer | 2011-03-28 23:51:07 -0400 | |
commit | a3b6586902d6689b07c050b1fc50e19f4115c42e (patch) | |
tree | 51d1658cd393c31435cda2b618e03f68563b645a /Remote | |
parent | b1db436816b6b70ff0b9891bbc4a5468d9b895b3 (diff) |
update
Diffstat (limited to 'Remote')
-rw-r--r-- | Remote/Git.hs | 14 | ||||
-rw-r--r-- | Remote/S3.hs | 14 |
2 files changed, 20 insertions, 8 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 9021a2230..68bd172e9 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -6,7 +6,7 @@ -} module Remote.Git ( - generate, + remote, onRemote ) where @@ -30,8 +30,11 @@ import RsyncFile import Ssh import Config -generate :: Annex (RemoteGenerator Annex) -generate = do +remote :: RemoteType Annex +remote = RemoteType { typename = "git", generator = gen } + +gen :: Annex (RemoteGenerator Annex) +gen = do g <- Annex.gitRepo allremotes <- filterM remoteNotIgnored $ Git.remotes g @@ -64,7 +67,10 @@ genRemote r = do retrieveKeyFile = copyFromRemote r, removeKey = dropKey r, hasKey = inAnnex r, - hasKeyCheap = not (Git.repoIsUrl r) + hasKeyCheap = not (Git.repoIsUrl r), + hasConfig = False, + config = Nothing, + setup = \_ -> return () } {- Tries to read the config for a specified remote, updates state, and diff --git a/Remote/S3.hs b/Remote/S3.hs index 23ec33bb5..4aa1bc639 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -5,7 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} -module Remote.S3 (generate) where +module Remote.S3 (remote) where import Network.AWS.AWSConnection import Network.AWS.S3Object @@ -27,8 +27,11 @@ import qualified Annex import UUID import Config -generate :: Annex (RemoteGenerator Annex) -generate = do +remote :: RemoteType Annex +remote = RemoteType { typename = "S3", generator = gen } + +gen :: Annex (RemoteGenerator Annex) +gen = do g <- Annex.gitRepo remotes <- filterM remoteNotIgnored $ findS3Remotes g todo <- filterM cachedUUID remotes @@ -64,7 +67,10 @@ genRemote r u = do retrieveKeyFile = error "TODO", removeKey = error "TODO", hasKey = error "TODO", - hasKeyCheap = False + hasKeyCheap = False, + hasConfig = True, + config = Nothing, + setup = \_ -> return () } s3Connection :: Git.Repo -> Annex (Maybe AWSConnection) |