[Pkg-gnupg-commit] [libgpg-error] 06/32: Add error code USER_ID_EXISTS, NAME_EXISTS, and DUP_NAME.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository libgpg-error.

commit 0c837a82207d0b19f9dabc8870ffb23d6a4ade64
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Oct 7 16:25:34 2016 +0200

    Add error code USER_ID_EXISTS, NAME_EXISTS, and DUP_NAME.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 NEWS               |  3 +++
 doc/errorref.txt   | 10 +++++++++-
 src/err-codes.h.in |  4 +++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index f7e1af6..a646c7d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ Noteworthy changes in version 1.25 (unreleased) [C19/A19/R_)
  GPG_ERR_WINDOW_TOO_SMALL         NEW.
  GPG_ERR_WINDOW_TOO_LARGE         NEW.
  GPG_ERR_MISSING_ENVVAR	          NEW.
+ GPG_ERR_USER_ID_EXISTS           NEW.
+ GPG_ERR_NAME_EXISTS              NEW.
+ GPG_ERR_DUP_NAME                 NEW.
 
 
 Noteworthy changes in version 1.24 (2016-07-14) [C19/A19/R1)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index b943c67..da5df23 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -798,7 +798,7 @@ GPG_ERR_INV_LOCK_OBJ		Invalid lock object
 
 GPG_ERR_TRUE			True
 
-    Used to retrun the boolena value True.  Note that GPG_ERR_NO_ERROR
+    Used to return the boolean value True.  Note that GPG_ERR_NO_ERROR
     (with the value 0) is also often used to indicate the value true.
 
 GPG_ERR_FALSE			False
@@ -844,6 +844,14 @@ GPG_ERR_MISSING_ENVVAR (303)	Required environment variable not set
 
     Pinentry: - The size of the screen can't be determined.
 
+GPG_ERR_USER_ID_EXISTS (304)	User ID already exists
+
+    GNUPG: - Existing user ID in --quick-gen-key.
+
+GPG_ERR_NAME_EXISTS (305)	Name already exists
+GPG_ERR_DUP_NAME (306)		Duplicated name
+
+
 GPG_ERR_LDAP_GENERAL		LDAP General error
 
    Catch all error for LDAP.  Use if if can't map an erro rocde to an
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index dcbc0a3..1bf717d 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -323,7 +323,9 @@
 301	GPG_ERR_WINDOW_TOO_SMALL	Screen or window too small
 302	GPG_ERR_WINDOW_TOO_LARGE	Screen or window too large
 303	GPG_ERR_MISSING_ENVVAR		Required environment variable not set
-
+304	GPG_ERR_USER_ID_EXISTS		User ID already exists
+305	GPG_ERR_NAME_EXISTS		Name already exists
+306	GPG_ERR_DUP_NAME		Duplicated name
 # This range is free for use.
 
 #

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