aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to 'agent')
-rw-r--r--agent/ChangeLog4
-rw-r--r--agent/gpg-agent.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index d17f7e2df..5c3143c71 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-12 Werner Koch <[email protected]>
+
+ * gpg-agent.c (handle_tick): Do not print die message with option -q.
+
2010-05-11 Werner Koch <[email protected]>
* agent.h (opt): Add field USE_STANDARD_SOCKET.
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index a96108012..1aa706d24 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1660,8 +1660,11 @@ handle_tick (void)
if (kill (parent_pid, 0))
{
shutdown_pending = 2;
- log_info ("parent process died - shutting down\n");
- log_info ("%s %s stopped\n", strusage(11), strusage(13) );
+ if (!opt.quiet)
+ {
+ log_info ("parent process died - shutting down\n");
+ log_info ("%s %s stopped\n", strusage(11), strusage(13) );
+ }
cleanup ();
agent_exit (0);
}