TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

discovery: Hide Guile warnings when loading modules. 

Fixes <https://issues.guix.gnu.org/43747>.

* guix/discovery.scm (scheme-modules): Parameterize 'current-warning-port'.
This commit is contained in:
Ludovic Courtès 2021-09-30 10:16:02 +02:00
parent 270b30705d
commit bedcba8f5c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
guix/discovery.scm
View File

@ -107,19 +107,25 @@ name and the exception key and arguments."
(define prefix-len
(string-length directory))
(filter-map (lambda (file)
(let* ((relative (string-drop file prefix-len))
(module (file-name->module-name relative)))
(catch #t
(lambda ()
(resolve-interface module))
(lambda args
;; Report the error, but keep going.
(warn file module args)
#f))))
(scheme-files (if sub-directory
(string-append directory "/" sub-directory)
directory))))
;; Hide Guile warnings such as "source file [...] newer than compiled" when
;; loading user code, unless we're hacking on Guix proper. See
;; <https://issues.guix.gnu.org/43747>.
(parameterize ((current-warning-port (if (getenv "GUIX_UNINSTALLED")
(current-warning-port)
(%make-void-port "w"))))
(filter-map (lambda (file)
(let* ((relative (string-drop file prefix-len))
(module (file-name->module-name relative)))
(catch #t
(lambda ()
(resolve-interface module))
(lambda args
;; Report the error, but keep going.
(warn file module args)
#f))))
(scheme-files (if sub-directory
(string-append directory "/" sub-directory)
directory)))))
(define* (scheme-modules* directory #:optional sub-directory)
"Return the list of module names found under SUB-DIRECTORY in DIRECTORY.