summaryrefslogtreecommitdiff
path: root/Remote/S3.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-04-21 23:32:33 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-04-21 23:32:33 -0400
commited79596b758935a3f22bf6803bc082a6bbe10f58 (patch)
tree885a8a50e68dafb39ec886cb31aa4c549fbeb35e /Remote/S3.hs
parentbee420bd2d0cbe16489b061b208083e2b8ba9d0e (diff)
noop
Diffstat (limited to 'Remote/S3.hs')
-rw-r--r--Remote/S3.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs
index a688ffcf3..18d4915dc 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -93,7 +93,7 @@ s3Setup u c = handlehost $ M.lookup "host" c
archiveorg = do
showNote "Internet Archive mode"
- maybe (error "specify bucket=") (const $ return ()) $
+ maybe (error "specify bucket=") (const noop) $
M.lookup "bucket" archiveconfig
use archiveconfig
where
@@ -237,13 +237,13 @@ genBucket c = do
showAction "checking bucket"
loc <- liftIO $ getBucketLocation conn bucket
case loc of
- Right _ -> return ()
+ Right _ -> noop
Left err@(NetworkError _) -> s3Error err
Left (AWSError _ _) -> do
showAction $ "creating bucket in " ++ datacenter
res <- liftIO $ createBucketIn conn bucket datacenter
case res of
- Right _ -> return ()
+ Right _ -> noop
Left err -> s3Error err
where
bucket = fromJust $ M.lookup "bucket" c