diff options
| author | Werner Koch <wk@gnupg.org> | 2014-09-25 22:13:03 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-09-25 22:14:30 +0200 |
| commit | 20c6da50d4f6264d26d113d7de606971f719a0ca (patch) | |
| tree | 401d603c403c9aaaef8e3ee00d667ebfcdcc6795 /g10/misc.c | |
| parent | gpg: Warn about (but don't fail) on scdaemon options in gpg.conf. (diff) | |
| download | gnupg2-20c6da50d4f6264d26d113d7de606971f719a0ca.tar.xz gnupg2-20c6da50d4f6264d26d113d7de606971f719a0ca.zip | |
gpg: Do not always print dashes in obsolete_option.
* g10/gpg.c (main): Pass option names to obsolete_option without
double dash.
* g10/misc.c (obsolete_option, obsolete_scdaemon_option): Print double
dash only for command line options.
Diffstat (limited to 'g10/misc.c')
| -rw-r--r-- | g10/misc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/g10/misc.c b/g10/misc.c index fa04387fa..76faa49f6 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -1038,8 +1038,8 @@ obsolete_option (const char *configname, unsigned int configlineno, log_info (_("%s:%u: obsolete option \"%s\" - it has no effect\n"), configname, configlineno, name); else - log_info (_("WARNING: \"%s\" is an obsolete option - it has no effect\n"), - name); + log_info (_("WARNING: \"%s%s\" is an obsolete option - it has no effect\n"), + "--", name); } @@ -1052,8 +1052,9 @@ obsolete_scdaemon_option (const char *configname, unsigned int configlineno, " - it only has effect in %s\n"), configname, configlineno, name, SCDAEMON_NAME EXTSEP_S "conf"); else - log_info (_("WARNING: \"%s\" is an obsolete option" - " - it has no effect except on %s\n"), name, SCDAEMON_NAME); + log_info (_("WARNING: \"%s%s\" is an obsolete option" + " - it has no effect except on %s\n"), + "--", name, SCDAEMON_NAME); } |