diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 58d3cd7e83..d294df4f37 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -752,6 +752,7 @@ (define (channel-list opts) (define (load-channels file) (let ((result (load* file (make-user-module '((guix channels)))))) + (pk 'load-channels result) (if (and (list? result) (every channel? result)) result (leave (G_ "'~a' did not return a list of channels~%") file)))) diff --git a/guix/ui.scm b/guix/ui.scm index eba12c8616..651cea4ff7 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -250,7 +250,11 @@ (define* (load* file user-module ;; 'primitive-load', so that FILE is compiled, which then allows ;; us to provide better error reporting with source line numbers. (without-compiler-optimizations - (load (try-canonicalize-path file)))) + (begin + (pk 'file file) + (pk 'try-canonicalize-path (try-canonicalize-path file)) + (pk 'load-file (load file)) + (load (try-canonicalize-path file))))) (const #f)))))) (lambda _ ;; XXX: Errors are reported from the pre-unwind handler below, but @@ -262,6 +266,7 @@ (define* (load* file user-module (let* ((stack (make-stack #t handle-error tag)) (frame (last-frame-with-source stack))) + (pk 'let-raise-error) (report-load-error file args frame) (case on-error