me
/
guix
Archived
1
0
Fork 0
Code

file-systems: Avoid load-time warnings when attempting to load (guix store). 

This makes sure warnings like "incompatible bytecode version" don't go
through when looking for (guix store).

* gnu/system/file-systems.scm (%store-prefix): Parameterize
'current-warning-port' around 'resolve-module' call.
master
Ludovic Courtès 2022-04-16 16:13:34 +02:00
parent 774f8804ba
commit eaebc7f2b7
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/system/file-systems.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013-2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Google LLC ;;; Copyright © 2020 Google LLC
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@ -272,7 +272,8 @@ flags are found."
;; Note: If we have (guix store database) in the search path and we do *not* ;; Note: If we have (guix store database) in the search path and we do *not*
;; have (guix store) proper, 'resolve-module' returns an empty (guix store) ;; have (guix store) proper, 'resolve-module' returns an empty (guix store)
;; with one sub-module. ;; with one sub-module.
(cond ((and=> (resolve-module '(guix store) #:ensure #f) (cond ((and=> (parameterize ((current-warning-port (%make-void-port "w0")))
(resolve-module '(guix store) #:ensure #f))
(lambda (store) (lambda (store)
(module-variable store '%store-prefix))) (module-variable store '%store-prefix)))
=> =>