diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-01-05 23:14:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-01-05 23:14:10 -0400 |
| commit | f534fcc7b1a01f30e4ee41a0a364fe2cbf25d5a8 (patch) | |
| tree | 0be416a3e911b29f5c59182840e224e2ee23b754 /Remote | |
| parent | c371c40a889c73b79f7f8918b2918e2fbb75f212 (diff) | |
remove S3stub stuff
Let's keep that in a no-s3 branch, which can be merged into eg,
debian-stable.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/S3.hs (renamed from Remote/S3real.hs) | 6 | ||||
| -rw-r--r-- | Remote/S3stub.hs | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/Remote/S3real.hs b/Remote/S3.hs index 96a831e34..bef89b553 100644 --- a/Remote/S3real.hs +++ b/Remote/S3.hs @@ -28,8 +28,8 @@ import Crypto import Annex.Content import Utility.Base64 -remote :: Maybe RemoteType -remote = Just $ RemoteType { +remote :: RemoteType +remote = RemoteType { typename = "S3", enumerate = findSpecialRemotes "s3", generate = gen, @@ -58,7 +58,7 @@ gen' r u c cst = hasKeyCheap = False, config = c, repo = r, - remotetype = fromJust remote + remotetype = remote } s3Setup :: UUID -> RemoteConfig -> Annex RemoteConfig diff --git a/Remote/S3stub.hs b/Remote/S3stub.hs deleted file mode 100644 index 5bd2b1c79..000000000 --- a/Remote/S3stub.hs +++ /dev/null @@ -1,7 +0,0 @@ --- stub for when hS3 is not available -module Remote.S3 (remote) where - -import Types - -remote :: Maybe RemoteType -remote = Nothing |