From 2a785147be0d0dbec09ea1b63ff5b06d123169b0 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 31 Dec 2003 04:58:52 +0000 Subject: * options.h, g10.c (main), import.c (parse_import_options, import_one, import_secret_one), keyserver.c (keyserver_refresh): Change --merge-only to --import-option merge-only. Deprecate --merge-only. --- g10/g10.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'g10/g10.c') diff --git a/g10/g10.c b/g10/g10.c index 60c52672b..20d781cf3 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -2010,7 +2010,11 @@ main( int argc, char **argv ) case oOverrideSessionKey: opt.override_session_key = pargs.r.ret_str; break; - case oMergeOnly: opt.merge_only = 1; break; + case oMergeOnly: + deprecated_warning(configname,configlineno,"--merge-only", + "--import-options ","merge-only"); + opt.import_options|=IMPORT_MERGE_ONLY; + break; case oAllowSecretKeyImport: /* obsolete */ break; case oTryAllSecrets: opt.try_all_secrets = 1; break; case oTrustedKey: register_trusted_key( pargs.r.ret_str ); break; -- cgit v1.2.3