From 30dac0486b6357e84fbe79c612eea940b654e4d1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 13 Feb 2017 19:38:53 +0100 Subject: [PATCH] gpgconf: No ENOENT warning with --change-options et al. * tools/gpgconf-comp.c (retrieve_options_from_program): Check ERRNO before printing a warning. -- It is common that a conf files does not exist - thus we should not print a warning. GnuPG-bug-id: 2944 BTW: The error messages in gpgconf should be reworked to match those of the other components. Signed-off-by: Werner Koch --- tools/gpgconf-comp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 20e841130..d1144b2c9 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -2164,8 +2164,11 @@ retrieve_options_from_program (gc_component_t component, gc_backend_t backend) config = es_fopen (config_filename, "r"); if (!config) - gc_error (0, errno, "warning: can not open config file %s", - config_filename); + { + if (errno != ENOENT) + gc_error (0, errno, "warning: can not open config file %s", + config_filename); + } else { while ((length = es_read_line (config, &line, &line_len, NULL)) > 0)