02/06: ui: Ignore 'raise-exception' frames when reporting exceptions.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit abbb98714b455f36373c17f00c82db9d1c41d5db
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Jan 17 17:11:34 2020 +0100

    ui: Ignore 'raise-exception' frames when reporting exceptions.
    
    * guix/ui.scm (last-frame-with-source): Check whether FRAME corresponds
    to 'raise-exception' and skip it if it does.
---
 guix/ui.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/ui.scm b/guix/ui.scm
index 01aeee4..4857a88 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -175,7 +175,11 @@ information, or #f if it could not be found."
                (previous frame))
       (if (not frame)
           previous
-          (if (frame-source frame)
+
+          ;; On Guile 3, the latest frame with source may be that of
+          ;; 'raise-exception' in boot-9.scm.  Skip it.
+          (if (and (frame-source frame)
+                   (not (eq? 'raise-exception (frame-procedure-name frame))))
               frame
               (loop (frame-previous frame) frame)))))