mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* main.h, misc.c (parse_options): Add a "noisy" flag to enable and disable
the messages about which option didn't match or matched ambiguously. Change all callers (g10.c, keyserver.c). * main.h, import.c (import_options), export.c (export_options): Pass the noisy flag through.
This commit is contained in:
parent
7847eae02c
commit
392e6da660
7 changed files with 35 additions and 20 deletions
|
@ -1873,7 +1873,7 @@ main( int argc, char **argv )
|
|||
parse_keyserver_options(pargs.r.ret_str);
|
||||
break;
|
||||
case oImportOptions:
|
||||
if(!parse_import_options(pargs.r.ret_str,&opt.import_options))
|
||||
if(!parse_import_options(pargs.r.ret_str,&opt.import_options,1))
|
||||
{
|
||||
if(configname)
|
||||
log_error(_("%s:%d: invalid import options\n"),
|
||||
|
@ -1883,7 +1883,7 @@ main( int argc, char **argv )
|
|||
}
|
||||
break;
|
||||
case oExportOptions:
|
||||
if(!parse_export_options(pargs.r.ret_str,&opt.export_options))
|
||||
if(!parse_export_options(pargs.r.ret_str,&opt.export_options,1))
|
||||
{
|
||||
if(configname)
|
||||
log_error(_("%s:%d: invalid export options\n"),
|
||||
|
@ -1908,7 +1908,7 @@ main( int argc, char **argv )
|
|||
{NULL,0}
|
||||
};
|
||||
|
||||
if(!parse_options(pargs.r.ret_str,&opt.list_options,lopts))
|
||||
if(!parse_options(pargs.r.ret_str,&opt.list_options,lopts,1))
|
||||
{
|
||||
if(configname)
|
||||
log_error(_("%s:%d: invalid list options\n"),
|
||||
|
@ -1932,7 +1932,7 @@ main( int argc, char **argv )
|
|||
{NULL,0}
|
||||
};
|
||||
|
||||
if(!parse_options(pargs.r.ret_str,&opt.verify_options,vopts))
|
||||
if(!parse_options(pargs.r.ret_str,&opt.verify_options,vopts,1))
|
||||
{
|
||||
if(configname)
|
||||
log_error(_("%s:%d: invalid verify options\n"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue