aboutsummaryrefslogtreecommitdiffstats
path: root/src/import.c
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2018-03-15 14:58:32 +0000
committerAndre Heinecke <[email protected]>2018-03-15 15:23:18 +0000
commita630a1e3e74c926163864b013cb164b4cd1866fc (patch)
treea3bcae0322c81ff5be44893ceef3072e7fe21821 /src/import.c
parentdocs: TODO (diff)
downloadgpgme-a630a1e3e74c926163864b013cb164b4cd1866fc.tar.gz
gpgme-a630a1e3e74c926163864b013cb164b4cd1866fc.zip
core: Parse skipped_v3_keys
* src/gpgme.h.in (gpgme_import_result_t): Extend with skipped_v3_keys. * src/import.c (gpgme_op_import_result): Extend debug with new field. (parse_import_res): Parse skipped_v3_keys. * tests/gpg/t-support.h, tests/run-support.h (print_import_result): Print skipped_v3_keys. -- This makes it possible to handle this in a GUI in a future version. GnuPG-Bug-Id: T3776
Diffstat (limited to 'src/import.c')
-rw-r--r--src/import.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/import.c b/src/import.c
index 386ca722..f0d9d9fa 100644
--- a/src/import.c
+++ b/src/import.c
@@ -94,8 +94,9 @@ gpgme_op_import_result (gpgme_ctx_t ctx)
TRACE_LOG3 ("%i secret keys, %i imported, %i unchanged",
opd->result.secret_read, opd->result.secret_imported,
opd->result.secret_unchanged);
- TRACE_LOG2 ("%i skipped new keys, %i not imported",
- opd->result.skipped_new_keys, opd->result.not_imported);
+ TRACE_LOG3 ("%i skipped new keys, %i not imported, %i v3 skipped",
+ opd->result.skipped_new_keys, opd->result.not_imported,
+ opd->result.skipped_v3_keys);
impstat = opd->result.imports;
i = 0;
@@ -212,6 +213,10 @@ parse_import_res (char *args, gpgme_import_result_t result)
PARSE_NEXT (result->secret_unchanged);
PARSE_NEXT (result->skipped_new_keys);
PARSE_NEXT (result->not_imported);
+ if (args && *args)
+ {
+ PARSE_NEXT (result->skipped_v3_keys);
+ }
return 0;
}