aboutsummaryrefslogtreecommitdiff
path: root/Creds.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-10 13:03:56 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-10 13:03:56 -0400
commitae8a630b3cfac9ed3ea8c3137619e13ee021071e (patch)
tree4c28656ee3a81c09b99cfee48844069a7958908b /Creds.hs
parentce8dcc753490e2a51cf86005944a5255520059cf (diff)
Added annex.gnupg-decrypt-options and remote.<name>.annex-gnupg-decrypt-options, which are passed to gpg when it's decrypting data.
The naming is unofrtunately not consistent, but the gnupg-options were only used for encrypting, and it's too late to change that. It would be nice to have a third setting that is always passed to gnupg, but ~/.gnupg/options can be used to specify such global options when really needed.
Diffstat (limited to 'Creds.hs')
-rw-r--r--Creds.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Creds.hs b/Creds.hs
index 8cc7eed1a..6a2eaafd5 100644
--- a/Creds.hs
+++ b/Creds.hs
@@ -94,7 +94,7 @@ getRemoteCredPair c storage = maybe fromcache (return . Just) =<< fromenv
Nothing -> return Nothing
fromenccreds enccreds cipher storablecipher = do
cmd <- gpgCmd <$> Annex.getGitConfig
- mcreds <- liftIO $ catchMaybeIO $ decrypt cmd cipher
+ mcreds <- liftIO $ catchMaybeIO $ decrypt cmd (getGpgDecParams c) cipher
(feedBytes $ L.pack $ fromB64 enccreds)
(readBytes $ return . L.unpack)
case mcreds of