[git] GPGME - branch, master, updated. gpgme-1.6.0-251-g4e728de

[by Justus Winter]

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 "GnuPG Made Easy".

The branch, master has been updated
       via  4e728de8421e2ade2061786aaebcdae3f60da3b8 (commit)
       via  5a7c7a86f7e8eaf10e37138617a2d838f9d4466f (commit)
       via  b9e6eacd06ffeb36854c208aa4325cff3e3dfbbe (commit)
      from  2ff58fcbd5c060dac3a7feec478819d2c5a164ec (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 4e728de8421e2ade2061786aaebcdae3f60da3b8
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 28 18:14:08 2016 +0200

    python: Fix out-of-tree build.
    
    * lang/python/MANIFEST.in: Add 'private.h'.
    
    Fixes-commit: 3d4dc3f0
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/MANIFEST.in b/lang/python/MANIFEST.in
index abdc08f..eefdb83 100644
--- a/lang/python/MANIFEST.in
+++ b/lang/python/MANIFEST.in
@@ -1,4 +1,4 @@
 recursive-include examples *.py
 include gpgme-h-clean.py gpgme.i
-include helpers.c helpers.h
+include helpers.c helpers.h private.h
 recursive-include pyme *.py

commit 5a7c7a86f7e8eaf10e37138617a2d838f9d4466f
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 28 17:44:18 2016 +0200

    python: Improve error handling.
    
    * lang/python/pyme/core.py (Context.protocol): Check that the engine
    is usable before setting the protocol.
    (Context._errorcheck): Add missing functions.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/lang/python/pyme/core.py b/lang/python/pyme/core.py
index 50c6c0f..e12dc7b 100644
--- a/lang/python/pyme/core.py
+++ b/lang/python/pyme/core.py
@@ -546,6 +546,7 @@ class Context(GpgmeWrapper):
         return self.get_protocol()
     @protocol.setter
     def protocol(self, value):
+        errorcheck(gpgme.gpgme_engine_check_version(value))
         self.set_protocol(value)
 
     _ctype = 'gpgme_ctx_t'
@@ -553,14 +554,23 @@ class Context(GpgmeWrapper):
 
     def _errorcheck(self, name):
         """This function should list all functions returning gpgme_error_t"""
-        if (name.startswith('gpgme_op_') and \
-            not name.endswith('_result')) or \
-            name == 'gpgme_signers_add' or \
-            name == 'gpgme_set_locale' or \
-            name == 'gpgme_set_keylist_mode' or \
-            name == 'gpgme_set_protocol':
-            return 1
-        return 0
+        return ((name.startswith('gpgme_op_')
+                 and not name.endswith('_result'))
+                or name in {
+                    'gpgme_set_ctx_flag',
+                    'gpgme_set_protocol',
+                    'gpgme_set_sub_protocol',
+                    'gpgme_set_keylist_mode',
+                    'gpgme_set_pinentry_mode',
+                    'gpgme_set_locale',
+                    'gpgme_set_engine_info',
+                    'gpgme_signers_add',
+                    'gpgme_get_sig_key',
+                    'gpgme_sig_notation_add',
+                    'gpgme_cancel',
+                    'gpgme_cancel_async',
+                    'gpgme_cancel_get_key',
+                })
 
     _boolean_properties = {'armor', 'textmode', 'offline'}
 

commit b9e6eacd06ffeb36854c208aa4325cff3e3dfbbe
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 28 17:45:53 2016 +0200

    src: Fix dummy engine versions.
    
    Previously, 'gpgme_engine_check_version' failed for these protocols
    because the version parser failed to parse the dummy versions.
    
    * src/engine-assuan.c (llass_get_version): Use a version triple that
    the parser can understand.
    (llass_get_req_version): Likewise.
    * src/engine-spawn.c (engspawn_get_version): Likewise.
    (engspawn_get_req_version): Likewise.
    * src/engine-uiserver.c (uiserver_get_version): Likewise.
    (uiserver_get_req_version): Likewise.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 6f58e08..93d54d2 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -131,14 +131,14 @@ llass_get_home_dir (void)
 static char *
 llass_get_version (const char *file_name)
 {
-  return strdup ("1.0");
+  return strdup ("1.0.0");
 }
 
 
 static const char *
 llass_get_req_version (void)
 {
-  return "1.0";
+  return "1.0.0";
 }
 
 

diff --git a/src/engine-spawn.c b/src/engine-spawn.c
index b552388..c01b50e 100644
--- a/src/engine-spawn.c
+++ b/src/engine-spawn.c
@@ -312,14 +312,14 @@ static char *
 engspawn_get_version (const char *file_name)
 {
   (void)file_name;
-  return strdup ("1.0");
+  return strdup ("1.0.0");
 }
 
 
 static const char *
 engspawn_get_req_version (void)
 {
-  return "1.0";
+  return "1.0.0";
 }
 
 
diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
index 986f1d1..1869ff3 100644
--- a/src/engine-uiserver.c
+++ b/src/engine-uiserver.c
@@ -123,14 +123,14 @@ static void uiserver_io_event (void *engine,
 static char *
 uiserver_get_version (const char *file_name)
 {
-  return strdup ("1.0");
+  return strdup ("1.0.0");
 }
 
 
 static const char *
 uiserver_get_req_version (void)
 {
-  return "1.0";
+  return "1.0.0";
 }
 
 


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

Summary of changes:
 lang/python/MANIFEST.in  |  2 +-
 lang/python/pyme/core.py | 26 ++++++++++++++++++--------
 src/engine-assuan.c      |  4 ++--
 src/engine-spawn.c       |  4 ++--
 src/engine-uiserver.c    |  4 ++--
 5 files changed, 25 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org