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

Fix overbroad gpg --no-tty fix from last release.

Browse source 
Only set --no-tty when GPG_AGENT_INFO is set and batch mode is used.

In the test suite, set GPG_AGENT_INFO to /dev/null to avoid the test suite
relying on /dev/tty.
This commit is contained in:
Joey Hess 2012-01-07 12:38:08 -04:00
parent bdc49ddbdb
commit 60c1aeeb6f
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test.hs
View file

@ -663,6 +663,8 @@ test_bup_remote = "git-annex bup remote" ~: intmpclonerepo $ when Build.SysConfi
-- gpg is not a build dependency, so only test when it's available
test_crypto :: Test
test_crypto = "git-annex crypto" ~: intmpclonerepo $ when Build.SysConfig.gpg $ do
-- force gpg into batch mode for the tests
setEnv "GPG_AGENT_INFO" "/dev/null" True
Utility.Gpg.testTestHarness @? "test harness self-test failed"
Utility.Gpg.testHarness $ do
createDirectory "dir"