From ae8a630b3cfac9ed3ea8c3137619e13ee021071e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 May 2016 13:03:56 -0400 Subject: Added annex.gnupg-decrypt-options and remote..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. --- Creds.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Creds.hs') 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 -- cgit v1.2.3