[git] GnuPG - branch, master, updated. gnupg-2.1.20-94-gef1922b

[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 "The GNU Privacy Guard".

The branch, master has been updated
       via  ef1922b3b19df0aa7f8c15d503c603f76fc13f82 (commit)
      from  d2f6798621d751cd6ae6f091c4a2af4569c5b8aa (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 ef1922b3b19df0aa7f8c15d503c603f76fc13f82
Author: Justus Winter <justus at g10code.com>
Date:   Mon Apr 24 17:32:41 2017 +0200

    tests: Fix Python detection.
    
    * tests/gpgme/gpgme-defs.scm (python): Fix Python detection.
    --
    In 25e6444b3f4601c7821beab06bc4520deacb007b we changed the way GPGME
    creates the build directory for the Python bindings.  We now use the
    basename of the interpreter as an identifier, that means we have to
    get the base name right, a link to the same binary is not sufficient.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgme/gpgme-defs.scm b/tests/gpgme/gpgme-defs.scm
index 690d097..a74a174 100644
--- a/tests/gpgme/gpgme-defs.scm
+++ b/tests/gpgme/gpgme-defs.scm
@@ -167,13 +167,15 @@
 	     (expand-one (append acc (list (car v))) (cdr v))))))
 	values)))
 
-(define python (catch #f
-		      (path-expand "python" (string-split (getenv "PATH") *pathsep*))))
+(define python
+  (let loop ((pythons (list "python" "python2" "python3")))
+    (if (null? pythons)
+	#f
+	(catch (loop (cdr pythons))
+	       (unless (file-exists? (path-join gpgme-builddir "lang" "python"
+						(string-append (car pythons) "-gpg")))
+		       (throw "next please"))
+	       (path-expand (car pythons) (string-split (getenv "PATH") *pathsep*))))))
+
 (define (run-python-tests?)
-  (and python
-       (let* ((python-version
-	       (string-trim char-whitespace?
-			    (call-popen `(,python -c "import sys; print('{0}.{1}'.format(sys.version_info[0], sys.version_info[1]))") "")))
-	      (build-path (path-join gpgme-builddir "lang" "python"
-				     (string-append "python" python-version "-gpg"))))
-	 (file-exists? build-path))))
+  (not (not python)))

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

Summary of changes:
 tests/gpgme/gpgme-defs.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org