diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-10 20:24:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-10 20:57:28 -0400 |
| commit | 49d2177d51b95b4a01c05ee07e166e93751b4c51 (patch) | |
| tree | b818865e5a924dc90bf0a79608351b1aeffe458a /Remote/S3real.hs | |
| parent | a71c03bc5162916853ff520d5c7c89e849c6a047 (diff) | |
factored out some useful error catching methods
Diffstat (limited to 'Remote/S3real.hs')
| -rw-r--r-- | Remote/S3real.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/S3real.hs b/Remote/S3real.hs index 29117b3a4..97ac64821 100644 --- a/Remote/S3real.hs +++ b/Remote/S3real.hs @@ -286,7 +286,7 @@ s3GetCreds c = do _ -> return Nothing else return $ Just (ak, sk) where - getEnvKey s = liftIO $ catch (getEnv s) (const $ return "") + getEnvKey s = liftIO $ catchDefaultIO (getEnv s) "" {- Stores S3 creds encrypted in the remote's config if possible. -} s3SetCreds :: RemoteConfig -> Annex RemoteConfig |