aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2017-02-13 18:38:53 +0000
committerWerner Koch <[email protected]>2017-02-13 19:13:05 +0000
commit30dac0486b6357e84fbe79c612eea940b654e4d1 (patch)
tree764fa565728bad51bc931167786e129cc041bb75
parentgpg: Print a warning if no command has been given. (diff)
downloadgnupg-30dac0486b6357e84fbe79c612eea940b654e4d1.tar.gz
gnupg-30dac0486b6357e84fbe79c612eea940b654e4d1.zip
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 <[email protected]>
Diffstat (limited to '')
-rw-r--r--tools/gpgconf-comp.c7
1 files 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)