[Pkg-gnupg-commit] [gnupg2] 135/241: gpg: Use a more appropriate error code.

[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 eae982ed6d69644258afe9c4ad1be553853d8403
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Nov 17 13:42:43 2015 +0100

    gpg: Use a more appropriate error code.
    
    * g10/gpg.c (check_user_ids): Return a more appropriate error code if
    a user id is ambiguous.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/gpg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index dacfa74..0cc7038 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2209,7 +2209,7 @@ check_user_ids (strlist_t *sp,
             log_info (_("(check argument of option '%s')\n"), option);
 
           if (! rc)
-            rc = GPG_ERR_CONFLICT;
+            rc = GPG_ERR_AMBIGUOUS_NAME;
 
           err = keydb_get_keyblock (hd, &kb);
           if (err)

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