Merge branch 'master' into assistant
Conflicts: debian/changelog
This commit is contained in:
commit
dcd208513d
8 changed files with 83 additions and 9 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue