[git] GnuPG - branch, master, updated. gnupg-2.2.2-73-gd05e54a
by Werner Koch
cvs at cvs.gnupg.org
Wed Nov 15 13:56:04 CET 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, master has been updated
via d05e54ac4fadc66543ccca45bb90fea2bba49d14 (commit)
via 4a7fe9a596b639a0edb08502f20cb293129e5a33 (commit)
via 08a4b3bc41e50b14197177358fd054e6926753ef (commit)
via 149041b0b917f4298239fe18b5ebd5ead71584a6 (commit)
via 0471ff9d3bf8d6b9a359f3c426d70d0935066907 (commit)
from 166f3f9ec40888e10cb0c51017944bfc57503fc1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d05e54ac4fadc66543ccca45bb90fea2bba49d14
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 15 13:46:40 2017 +0100
i18n: Add an article to "agent" and lowercase "dirmngr" in one file.
--
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/asshelp.c b/common/asshelp.c
index 7f5173d..542747a 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -356,7 +356,7 @@ wait_for_sock (int secs, int which, const char *sockname,
{
log_info (which == 1?
_("connection to the dirmngr established\n"):
- _("connection to agent established\n"));
+ _("connection to the agent established\n"));
*did_success_msg = 1;
}
break;
@@ -513,7 +513,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
}
if (debug && !did_success_msg)
- log_debug ("connection to agent established\n");
+ log_debug ("connection to the agent established\n");
err = assuan_transact (ctx, "RESET",
NULL, NULL, NULL, NULL, NULL, NULL);
@@ -530,7 +530,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
NULL, NULL, NULL, NULL, NULL, NULL))
{
if (verbose)
- log_info (_("connection to agent is in restricted mode\n"));
+ log_info (_("connection to the agent is in restricted mode\n"));
err = 0;
}
}
@@ -587,7 +587,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
dirmngr_program = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
if (verbose)
- log_info (_("no running Dirmngr - starting '%s'\n"),
+ log_info (_("no running dirmngr - starting '%s'\n"),
dirmngr_program);
if (status_cb)
commit 4a7fe9a596b639a0edb08502f20cb293129e5a33
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 15 13:47:48 2017 +0100
common: Tweak new code to keep already translated strings.
* common/asshelp.c (wait_for_sock): Replace NAME by WHICH and adjust
caller. Revert to use the former strings.
--
Note that the second of these strings
"waiting for the agent to come up ... (%ds)\n"
"connection to agent established\n"
does not use a proper article. This should be fixed but would
introduce a string change so that it is better done in a separate
commit.
Fixes-commit: 0471ff9d3bf8d6b9a359f3c426d70d0935066907
Signed-off-by: Werner Koch <wk at gnupg.org>
diff --git a/common/asshelp.c b/common/asshelp.c
index 76f812d..7f5173d 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -307,8 +307,19 @@ unlock_spawning (lock_spawn_t *lock, const char *name)
}
}
+
+/* Helper for start_new_gpg_agent and start_new_dirmngr.
+ * Values for WHICH are:
+ * 0 - Start gpg-agent
+ * 1 - Start dirmngr
+ * SECS give the number of seconds to wait. SOCKNAME is the name of
+ * the socket to connect. VERBOSE is the usual verbose flag. CTX is
+ * the assuan context. DID_SUCCESS_MSG will be set to 1 if a success
+ * messages has been printed.
+ */
static gpg_error_t
-wait_for_sock (int secs, const char *name, const char *sockname, int verbose, assuan_context_t ctx, int *did_success_msg)
+wait_for_sock (int secs, int which, const char *sockname,
+ int verbose, assuan_context_t ctx, int *did_success_msg)
{
gpg_error_t err = 0;
int target_us = secs * 1000000;
@@ -329,8 +340,10 @@ wait_for_sock (int secs, const char *name, const char *sockname, int verbose, as
secsleft = (target_us - elapsed_us)/1000000;
if (secsleft < lastalert)
{
- log_info (_("waiting for the %s to come up ... (%ds)\n"),
- name, secsleft);
+ log_info (which == 1?
+ _("waiting for the dirmngr to come up ... (%ds)\n"):
+ _("waiting for the agent to come up ... (%ds)\n"),
+ secsleft);
lastalert = secsleft;
}
}
@@ -341,8 +354,9 @@ wait_for_sock (int secs, const char *name, const char *sockname, int verbose, as
{
if (verbose)
{
- log_info (_("connection to %s established\n"),
- name);
+ log_info (which == 1?
+ _("connection to the dirmngr established\n"):
+ _("connection to agent established\n"));
*did_success_msg = 1;
}
break;
@@ -354,6 +368,7 @@ wait_for_sock (int secs, const char *name, const char *sockname, int verbose, as
return err;
}
+
/* Try to connect to the agent via socket or start it if it is not
running and AUTOSTART is set. Handle the server's initial
greeting. Returns a new assuan context at R_CTX or an error
@@ -480,7 +495,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
log_error ("failed to start agent '%s': %s\n",
agent_program, gpg_strerror (err));
else
- err = wait_for_sock (SECS_TO_WAIT_FOR_AGENT, "agent",
+ err = wait_for_sock (SECS_TO_WAIT_FOR_AGENT, 0,
sockname, verbose, ctx, &did_success_msg);
}
@@ -614,7 +629,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
log_error ("failed to start the dirmngr '%s': %s\n",
dirmngr_program, gpg_strerror (err));
else
- err = wait_for_sock (SECS_TO_WAIT_FOR_DIRMNGR, "dirmngr",
+ err = wait_for_sock (SECS_TO_WAIT_FOR_DIRMNGR, 1,
sockname, verbose, ctx, &did_success_msg);
}
commit 08a4b3bc41e50b14197177358fd054e6926753ef
Merge: 166f3f9 149041b
Author: Werner Koch <wk at gnupg.org>
Date: Wed Nov 15 13:10:19 2017 +0100
Merge T3490-proposal1 into master
--
-----------------------------------------------------------------------
Summary of changes:
common/asshelp.c | 114 +++++++++++++++++++++++++++++++++----------------------
1 file changed, 69 insertions(+), 45 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list