[git] GPG-ERROR - branch, master, updated. libgpg-error-1.10-24-g27ffbcf

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Error codes used by GnuPG et al.".

The branch, master has been updated
       via  27ffbcf63cf4e0cf87d0f4012735f709e215d5cb (commit)
      from  e6bda00b966010934150b0c2134b24ff07b7c9fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 27ffbcf63cf4e0cf87d0f4012735f709e215d5cb
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 23 15:46:50 2011 +0200

    Add GPG_ERR_AMBIGUOUS

diff --git a/ChangeLog b/ChangeLog
index 887758e..ecf78dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2011-08-23  Werner Koch  <wk at g10code.com>
 
-	* src/err-codes.h.in: Add GPG_ERR_DUP_KEY.
+	* src/err-codes.h.in: Add GPG_ERR_DUP_KEY and GPG_ERR_AMBIGUOUS.
 
 2011-04-06  Werner Koch  <wk at g10code.com>
 
diff --git a/NEWS b/NEWS
index 856fda0..6ca6e3f 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Noteworthy changes in version 1.11 (unreleased)
  GPG_ERR_INV_CURVE             NEW.
  GPG_ERR_UNKNOWN_CURVE         NEW.
  GPG_ERR_DUP_KEY               NEW.
+ GPG_ERR_AMBIGUOUS             NEW.
 
 
 Noteworthy changes in version 1.10 (2010-10-26)
diff --git a/doc/errorref.txt b/doc/errorref.txt
index afabb0b..bbc9001 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -437,6 +437,11 @@ GPG_ERR_DUP_KEY                 Duplicated key
         A duplicated key was detected.  For example a unique key in a
         database occurred more than once.
 
+GPG_ERR_AMBIGUOUS		Ambiguous search
+
+        A search etc returned an ambigious result.  This usually means
+        that the search string was not specific enough.
+
 
 199	GPG_ERR_UNFINISHED		Operation not yet finished
 200	GPG_ERR_BUFFER_TOO_SHORT	Buffer too short
diff --git a/src/err-codes.h.in b/src/err-codes.h.in
index e722688..dcef931 100644
--- a/src/err-codes.h.in
+++ b/src/err-codes.h.in
@@ -218,8 +218,9 @@
 186	GPG_ERR_NO_KEYSERVER		No keyserver available
 187	GPG_ERR_INV_CURVE		Invalid elliptic curve
 188	GPG_ERR_UNKNOWN_CURVE		Unknown elliptic curve
-189     GPG_ERR_DUP_KEY                 Duplicated key
-# 190 to 197 are free to be used.
+189	GPG_ERR_DUP_KEY			Duplicated key
+190	GPG_ERR_AMBIGUOUS		Ambiguous result
+# 191 to 197 are free to be used.
 
 198	GPG_ERR_FULLY_CANCELED		Operation fully cancelled
 199	GPG_ERR_UNFINISHED		Operation not yet finished

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    2 +-
 NEWS               |    1 +
 doc/errorref.txt   |    5 +++++
 src/err-codes.h.in |    5 +++--
 4 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Error codes used by GnuPG et al.
http://git.gnupg.org