[Pkg-gnupg-commit] [gnupg2] 114/159: gpg: Improve error code from lock_all.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 9b6c91469a804c60289a2ed21334dfd856c294bb
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jan 13 14:48:02 2016 +0100

    gpg: Improve error code from lock_all.
    
    * g10/keydb.c (lock_all): Do not clobber RC during failur cleanup.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/keydb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g10/keydb.c b/g10/keydb.c
index 3ee9dfd..cf7b990 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -1003,7 +1003,7 @@ lock_all (KEYDB_HANDLE hd)
               keyring_lock (hd->active[i].u.kr, 0);
               break;
             case KEYDB_RESOURCE_TYPE_KEYBOX:
-              rc = keybox_lock (hd->active[i].u.kb, 0);
+              keybox_lock (hd->active[i].u.kb, 0);
               break;
             }
         }

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