mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixed formatting of "code"

Browse source
This commit is contained in:
EskildHustvedt 2012-08-17 07:32:45 +00:00 • committed by admin
parent 67c7777009
commit 211bcd11bd
1 changed files with 40 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

78
doc/bugs/gpg_needs_--use-agent.mdwn
View file

@ -1,48 +1,50 @@
git-annex gpg encryption fails here when GPG_AGENT_INFO is set, it needs to be supplied --use-agent to work. git-annex gpg encryption fails here when GPG_AGENT_INFO is set, it needs to be supplied --use-agent to work.
Output from git-annex: Output from git-annex:
copy file (to origin...) (gpg) gpg: can't query passphrase in batch mode
gpg: decryption failed: secret key not available
Command gpg ["--batch","--no-tty","--quiet","--trust-model","always","--decrypt"] failed; exit code 2
git-annex: user error (Command gpg ["--batch","--no-tty","--quiet","--trust-model","always","--decrypt"] failed; exit code 2) copy file (to origin...) (gpg) gpg: can't query passphrase in batch mode
failed gpg: decryption failed: secret key not available
Command gpg ["--batch","--no-tty","--quiet","--trust-model","always","--decrypt"] failed; exit code 2
git-annex: user error (Command gpg ["--batch","--no-tty","--quiet","--trust-model","always","--decrypt"] failed; exit code 2)
failed
Reproduced on command-line: Reproduced on command-line:
[0 zerodogg@browncoats ~]$ echo test > testfile
[0 zerodogg@browncoats ~]$ gpg -e testfile [0 zerodogg@browncoats ~]$ echo test > testfile
[0 zerodogg@browncoats ~]$ gpg --batch --no-tty --quiet --trust-model always --decrypt testfile.gpg [0 zerodogg@browncoats ~]$ gpg -e testfile
gpg: can't query passphrase in batch mode [0 zerodogg@browncoats ~]$ gpg --batch --no-tty --quiet --trust-model always --decrypt testfile.gpg
gpg: decryption failed: secret key not available gpg: can't query passphrase in batch mode
[2 zerodogg@browncoats ~]$ gpg --use-agent --batch --no-tty --quiet --trust-model always --decrypt testfile.gpg gpg: decryption failed: secret key not available
test [2 zerodogg@browncoats ~]$ gpg --use-agent --batch --no-tty --quiet --trust-model always --decrypt testfile.gpg
[0 zerodogg@browncoats ~]$ test
[0 zerodogg@browncoats ~]$
A patch to fix this issue: A patch to fix this issue:
From 77cb02d15245e9ad6e127388adcda960000fb3b8 Mon Sep 17 00:00:00 2001 From 77cb02d15245e9ad6e127388adcda960000fb3b8 Mon Sep 17 00:00:00 2001
From: Eskild Hustvedt <code@zerodogg.org> From: Eskild Hustvedt <code@zerodogg.org>
Date: Fri, 17 Aug 2012 09:21:44 +0200 Date: Fri, 17 Aug 2012 09:21:44 +0200
Subject: [PATCH] Explicitly enable agent to ensure decryption works Subject: [PATCH] Explicitly enable agent to ensure decryption works
Otherwise gpg will fail when GPG_AGENT_INFO is set in certain cases. Otherwise gpg will fail when GPG_AGENT_INFO is set in certain cases.
--- ---
Utility/Gpg.hs | 2 +- Utility/Gpg.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs
index e13afe5..c28b209 100644 index e13afe5..c28b209 100644
--- a/Utility/Gpg.hs --- a/Utility/Gpg.hs
+++ b/Utility/Gpg.hs +++ b/Utility/Gpg.hs
@@ -29,7 +29,7 @@ stdParams params = do @@ -29,7 +29,7 @@ stdParams params = do
b <- getEnv "GPG_BATCH" b <- getEnv "GPG_BATCH"
let batch = if isNothing e && isNothing b let batch = if isNothing e && isNothing b
then [] then []
- else ["--batch", "--no-tty"] - else ["--batch", "--no-tty"]
+ else ["--batch", "--no-tty", "--use-agent"] + else ["--batch", "--no-tty", "--use-agent"]
return $ batch ++ defaults ++ toCommand params return $ batch ++ defaults ++ toCommand params
where where
-- be quiet, even about checking the trustdb -- be quiet, even about checking the trustdb
-- --
1.7.10.4 1.7.10.4