[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: reconfigure: Silence Guile warnings.
From: |
guix-commits |
Subject: |
02/04: reconfigure: Silence Guile warnings. |
Date: |
Fri, 3 Apr 2020 06:58:24 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 9fb3ff31c15f36545bad11c1d9b11eaf0333f831
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri Apr 3 10:48:32 2020 +0200
reconfigure: Silence Guile warnings.
Fixes <https://bugs.gnu.org/39301>.
Reported by address@hidden.
* guix/scripts/system/reconfigure.scm (switch-to-system)
(upgrade-shepherd-services, install-bootloader): Wrap 'primitive-load'
call in 'parameterize'.
---
guix/scripts/system/reconfigure.scm | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/guix/scripts/system/reconfigure.scm
b/guix/scripts/system/reconfigure.scm
index c8d1ed4..074c48f 100644
--- a/guix/scripts/system/reconfigure.scm
+++ b/guix/scripts/system/reconfigure.scm
@@ -100,7 +100,8 @@ atomically, and run OS's activation script."
"Using EVAL, a monadic procedure taking a single G-Expression as an argument,
create a new generation of PROFILE pointing to the directory of OS, switch to
it atomically, and run OS's activation script."
- (eval #~(primitive-load #$(switch-system-program os profile))))
+ (eval #~(parameterize ((current-warning-port (%make-void-port "w")))
+ (primitive-load #$(switch-system-program os profile)))))
;;;
@@ -176,10 +177,11 @@ services as defined by OS."
(map live-service-canonical-name
live-services)))
(service-files (map shepherd-service-file target-services)))
- (eval #~(primitive-load #$(upgrade-services-program service-files
- to-start
- to-unload
- to-restart)))))))
+ (eval #~(parameterize ((current-warning-port (%make-void-port "w")))
+ (primitive-load #$(upgrade-services-program service-files
+ to-start
+ to-unload
+
to-restart))))))))
;;;
@@ -252,9 +254,10 @@ additional configurations specified by MENU-ENTRIES can be
selected."
(package (bootloader-package bootloader))
(device (bootloader-configuration-target configuration))
(bootcfg-file (bootloader-configuration-file bootloader)))
- (eval #~(primitive-load #$(install-bootloader-program installer
- package
- bootcfg
- bootcfg-file
- device
- target)))))
+ (eval #~(parameterize ((current-warning-port (%make-void-port "w")))
+ (primitive-load #$(install-bootloader-program installer
+ package
+ bootcfg
+ bootcfg-file
+ device
+ target))))))