guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/14: file-systems: Avoid load-time warnings when attempting to load (g


From: guix-commits
Subject: 02/14: file-systems: Avoid load-time warnings when attempting to load (guix store).
Date: Sun, 1 May 2022 16:15:32 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit eaebc7f2b715093baf0d4a8c86d7e1a6af20ebc8
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Apr 16 16:13:34 2022 +0200

    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.
---
 gnu/system/file-systems.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm
index 437f8da898..f8f4276283 100644
--- a/gnu/system/file-systems.scm
+++ b/gnu/system/file-systems.scm
@@ -1,5 +1,5 @@
 ;;; 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 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; 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*
   ;; have (guix store) proper, 'resolve-module' returns an empty (guix store)
   ;; 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)
                   (module-variable store '%store-prefix)))
          =>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]