diff options
| author | Ingo Klöcker <[email protected]> | 2023-06-01 07:34:25 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2023-06-01 07:37:41 +0000 |
| commit | 7990f70107bc8487f954c6885436a7661e162929 (patch) | |
| tree | f42adf00e941cb78ed158d37866517fa1f00b7b6 | |
| parent | cpp,python: Respect --disable-gpg-test for tests (diff) | |
| download | gpgme-7990f70107bc8487f954c6885436a7661e162929.tar.gz gpgme-7990f70107bc8487f954c6885436a7661e162929.zip | |
doc,cpp: Treat GPG_ERR_FULLY_CANCELED as canceled
* doc/gpgme.texi (GPG_ERR_FULLY_CANCELED): New.
* lang/cpp/src/context.cpp (Error::isCanceled): Also return true for
GPG_ERR_FULLY_CANCELED.
--
For internal purposes, GnuPG sometimes uses the error code
GPG_ERR_FULLY_CANCELED instead of GPG_ERR_CANCELED. From a user
perspective both values mean the same thing and should therefore be
treated identically.
GnuPG-bug-id: 6510
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | doc/gpgme.texi | 5 | ||||
| -rw-r--r-- | lang/cpp/src/context.cpp | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -1,6 +1,9 @@ Noteworthy changes in version 1.21.0 (unreleased) ------------------------------------------------- + * Error::isCanceled now also returns true for error code + GPG_ERR_FULLY_CANCELED. [T6510] + Noteworthy changes in version 1.20.0 (2023-04-20) ------------------------------------------------- diff --git a/doc/gpgme.texi b/doc/gpgme.texi index 606d13bb..bc89792a 100644 --- a/doc/gpgme.texi +++ b/doc/gpgme.texi @@ -1649,6 +1649,11 @@ when requested. @item GPG_ERR_CANCELED This value means that the operation was canceled. +@item GPG_ERR_FULLY_CANCELED +This value means that the operation was canceled. It is sometimes returned +instead of @code{GPG_ERR_CANCELED} for internal reasons in GnuPG. You should +treat both values identically. + @item GPG_ERR_INV_ENGINE This value means that the engine that implements the desired protocol is currently not available. This can either be because the sources diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp index 7667eb30..bdcfabed 100644 --- a/lang/cpp/src/context.cpp +++ b/lang/cpp/src/context.cpp @@ -142,7 +142,7 @@ int Error::sourceID() const bool Error::isCanceled() const { - return code() == GPG_ERR_CANCELED; + return code() == GPG_ERR_CANCELED || code() == GPG_ERR_FULLY_CANCELED; } int Error::toErrno() const |