diff options
| author | David Shaw <[email protected]> | 2003-12-31 04:58:52 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-12-31 04:58:52 +0000 |
| commit | 2a785147be0d0dbec09ea1b63ff5b06d123169b0 (patch) | |
| tree | 28d8b1040eae1fcd1216d8f284372565025ff336 /g10/g10.c | |
| parent | * g10m.c: Dead code. Remove. (diff) | |
| download | gnupg-2a785147be0d0dbec09ea1b63ff5b06d123169b0.tar.gz gnupg-2a785147be0d0dbec09ea1b63ff5b06d123169b0.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/g10.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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; |