[Pkg-gnupg-commit] [gnupg2] 94/185: gpg: Fix importing keys.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 956da89193370d5aa970cff5b77f605534481a02
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 14 11:17:49 2017 +0200

    gpg: Fix importing keys.
    
    * g10/import.c (import_one): Fix error handling.
    
    Fixes-commit: 330212efb927c119bb5135856f8582c0e4e2e6b7
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 g10/import.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/g10/import.c b/g10/import.c
index 8010fa5..1737479 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1627,9 +1627,12 @@ import_one (ctrl_t ctrl,
       if ( !(options & IMPORT_RESTORE) )
         {
           rc = apply_meta_data (keyblock, 0, origin);
-          log_error ("apply_meta_data failed: %s\n", gpg_strerror (rc));
-          keydb_release (hd);
-          return GPG_ERR_GENERAL;
+          if (rc)
+            {
+              log_error ("apply_meta_data failed: %s\n", gpg_strerror (rc));
+              keydb_release (hd);
+              return GPG_ERR_GENERAL;
+            }
         }
 
       rc = keydb_insert_keyblock (hd, keyblock );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git