|
 |
e4fdbb |
diff -up gnupg-2.1.19/common/asshelp.c.exponential gnupg-2.1.19/common/asshelp.c
|
|
|
e4fdbb |
--- gnupg-2.1.19/common/asshelp.c.exponential 2017-03-01 14:04:33.000000000 +0100
|
|
|
e4fdbb |
+++ gnupg-2.1.19/common/asshelp.c 2017-03-15 17:18:14.279792654 +0100
|
|
|
e4fdbb |
@@ -434,12 +434,12 @@ start_new_gpg_agent (assuan_context_t *r
|
|
|
e4fdbb |
agent_program, gpg_strerror (err));
|
|
|
e4fdbb |
else
|
|
|
e4fdbb |
{
|
|
|
e4fdbb |
- for (i=0; i < SECS_TO_WAIT_FOR_AGENT; i++)
|
|
|
e4fdbb |
+ for (i=2; i < SECS_TO_WAIT_FOR_AGENT*1000; i<<=1) /* start with 2 ms */
|
|
|
e4fdbb |
{
|
|
|
e4fdbb |
- if (verbose)
|
|
|
e4fdbb |
+ if (verbose && i > 500)
|
|
|
e4fdbb |
log_info (_("waiting for the agent to come up ... (%ds)\n"),
|
|
|
e4fdbb |
- SECS_TO_WAIT_FOR_AGENT - i);
|
|
|
e4fdbb |
- gnupg_sleep (1);
|
|
|
e4fdbb |
+ SECS_TO_WAIT_FOR_AGENT - i/1000);
|
|
|
e4fdbb |
+ gnupg_usleep (i*1000);
|
|
|
e4fdbb |
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
|
|
e4fdbb |
if (!err)
|
|
|
e4fdbb |
{
|
|
|
e4fdbb |
@@ -587,13 +587,13 @@ start_new_dirmngr (assuan_context_t *r_c
|
|
|
e4fdbb |
{
|
|
|
e4fdbb |
int i;
|
|
|
e4fdbb |
|
|
|
e4fdbb |
- for (i=0; i < SECS_TO_WAIT_FOR_DIRMNGR; i++)
|
|
|
e4fdbb |
+ for (i=2; i < SECS_TO_WAIT_FOR_DIRMNGR*1000; i<<=1) /* start with 2 ms */
|
|
|
e4fdbb |
{
|
|
|
e4fdbb |
- if (verbose)
|
|
|
e4fdbb |
+ if (verbose && i > 500)
|
|
|
e4fdbb |
log_info (_("waiting for the dirmngr "
|
|
|
e4fdbb |
"to come up ... (%ds)\n"),
|
|
|
e4fdbb |
- SECS_TO_WAIT_FOR_DIRMNGR - i);
|
|
|
e4fdbb |
- gnupg_sleep (1);
|
|
|
e4fdbb |
+ SECS_TO_WAIT_FOR_DIRMNGR - i/1000);
|
|
|
e4fdbb |
+ gnupg_usleep (i*1000);
|
|
|
e4fdbb |
err = assuan_socket_connect (ctx, sockname, 0, 0);
|
|
|
e4fdbb |
if (!err)
|
|
|
e4fdbb |
{
|