diff options
| author | Werner Koch <wk@gnupg.org> | 2010-06-24 12:51:30 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2010-06-24 12:51:30 +0200 |
| commit | c8bafe218c9ecf2bddef8d67753778afa8d9d30c (patch) | |
| tree | d33f9589db631d060447e09ac64ee2f70d9d9e41 /tools | |
| parent | Remove cruft. (diff) | |
| download | gnupg2-c8bafe218c9ecf2bddef8d67753778afa8d9d30c.tar.xz gnupg2-c8bafe218c9ecf2bddef8d67753778afa8d9d30c.zip | |
Fix a regression from 2010-06-09.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ChangeLog | 6 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index c1206d591..d3238b28c 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,9 @@ +2010-06-24 Werner Koch <wk@g10code.com> + + * gpgconf-comp.c (gpg_agent_runtime_change) + (scdaemon_runtime_change, retrieve_options_from_program): Use HANG + option for gnupg_wait_progress. Fixes regression from 2010-06-09. + 2010-06-07 Werner Koch <wk@g10code.com> * gpgtar.c, gpgtar.h, gpgtar-list.c, gpgtar-create.c diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 505ca465a..f37a929aa 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -1051,7 +1051,7 @@ gpg_agent_runtime_change (void) err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); if (!err) - err = gnupg_wait_process (pgmname, pid, 0, NULL); + err = gnupg_wait_process (pgmname, pid, 1, NULL); if (err) gc_error (0, 0, "error running `%s%s': %s", pgmname, " reloadagent", gpg_strerror (err)); @@ -1083,7 +1083,7 @@ scdaemon_runtime_change (void) err = gnupg_spawn_process_fd (pgmname, argv, -1, -1, -1, &pid); if (!err) - err = gnupg_wait_process (pgmname, pid, 0, NULL); + err = gnupg_wait_process (pgmname, pid, 1, NULL); if (err) gc_error (0, 0, "error running `%s%s': %s", pgmname, " scd killscd", gpg_strerror (err)); @@ -1503,7 +1503,7 @@ gc_component_check_options (int component, FILE *out, const char *conf_file) close (filedes[1]); errlines = collect_error_output (filedes[0], gc_component[component].name); - if (gnupg_wait_process (pgmname, pid, 0, &exitcode)) + if (gnupg_wait_process (pgmname, pid, 1, &exitcode)) { if (exitcode == -1) result |= 1; /* Program could not be run or it @@ -1922,7 +1922,7 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend) if (fclose (config) && ferror (config)) gc_error (1, errno, "error closing %s", pgmname); - err = gnupg_wait_process (pgmname, pid, 0, &exitcode); + err = gnupg_wait_process (pgmname, pid, 1, &exitcode); if (err) gc_error (1, 0, "running %s failed (exitcode=%d): %s", pgmname, exitcode, gpg_strerror (err)); |