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

Merge branch 'master' into assistant

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2012-08-17 08:22:43 -07:00
commit dcd208513d
8 changed files with 83 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utility/Gpg.hs
View file

@ -28,7 +28,7 @@ stdParams params = do
b <- getEnv "GPG_BATCH"
let batch = if isNothing e && isNothing b
then []
else ["--batch", "--no-tty"]
else ["--batch", "--no-tty", "--use-agent"]
return $ batch ++ defaults ++ toCommand params
where
-- be quiet, even about checking the trustdb