[Pkg-gnupg-commit] [gnupg2] 89/185: gpgscm: Make it impossible to catch '*interpreter-exit*'.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit bce02a8b0f0e51775a4ee5536ccf35efc1f15ca6
Author: Justus Winter <justus at g10code.com>
Date:   Tue Jul 11 16:07:39 2017 +0200

    gpgscm: Make it impossible to catch '*interpreter-exit*'.
    
    * tests/gpgscm/init.scm (throw'): Make it impossible to catch
    '*interpreter-exit*'.  This fixes 'exit' (and with it 'fail') inside
    'catch' statements.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/gpgscm/init.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/gpgscm/init.scm b/tests/gpgscm/init.scm
index b78a59e..66bec0f 100644
--- a/tests/gpgscm/init.scm
+++ b/tests/gpgscm/init.scm
@@ -605,12 +605,12 @@
 ;; This is used by the vm to throw exceptions.
 (define (throw' message args history)
   (cond
-   ((more-handlers?)
-    ((pop-handler) message args history))
    ((and args (list? args) (= 2 (length args))
 	 (equal? *interpreter-exit* (car args)))
     (*run-atexit-handlers*)
     (quit (cadr args)))
+   ((more-handlers?)
+    ((pop-handler) message args history))
    (else
     (display message)
     (when (and args (not (null? args)))

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