aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2007-04-13 11:45:05 +0000
committerWerner Koch <[email protected]>2007-04-13 11:45:05 +0000
commit6ae6e18d5fc677d72aad050fd6bb8323836dd929 (patch)
treebcb900b825a7a6f36ebb69858fd6ad8ce80ab27a /g10
parent* parse-packet.c (parse_marker): New. Enforce that the marker (diff)
downloadgnupg-6ae6e18d5fc677d72aad050fd6bb8323836dd929.tar.gz
gnupg-6ae6e18d5fc677d72aad050fd6bb8323836dd929.zip
g10/ and sm/
* call-agent.c (start_agent): Don't use log_error when using the fallback hack to start the agent. This is bug 782. scripts/ * mail-to-translators: Copied from 1.4. and adjusted. tools/ * gpgconf-comp.c: Allow changing of --allow-mark-trusted. * gpg-connect-agent.c (main): New option --decode and commands decode and undecode. (read_and_print_response): Implement option.
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/call-agent.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 01071dcd0..bbd969982 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-13 Werner Koch <[email protected]>
+
+ * call-agent.c (start_agent): Don't use log_error when using the
+ fallback hack to start the agent. This is bug 782.
+
2007-04-05 David Shaw <[email protected]>
From STABLE-BRANCH-1-4
diff --git a/g10/call-agent.c b/g10/call-agent.c
index b5e76fdbf..637669176 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -157,7 +157,7 @@ start_agent (void)
xfree (infostr);
if (gpg_err_code (rc) == GPG_ERR_ASS_CONNECT_FAILED)
{
- log_error (_("can't connect to the agent - trying fall back\n"));
+ log_info (_("can't connect to the agent - trying fall back\n"));
force_pipe_server = 1;
return start_agent ();
}