[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/10: services: provenance: Wrap config file name in 'assume-valid-file
From: |
guix-commits |
Subject: |
09/10: services: provenance: Wrap config file name in 'assume-valid-file-name'. |
Date: |
Fri, 16 Oct 2020 09:03:23 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 5dbfdf8be4dc6250ab8475874e232e653b042cbf
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Oct 16 14:57:25 2020 +0200
services: provenance: Wrap config file name in 'assume-valid-file-name'.
This gets rid of a pointless 'local-file' warning when running
'guix system reconfigure FILE' and FILE is a relative file name.
* gnu/services.scm (provenance-entry): Wrap CONFIG-FILE in
'assume-valid-file-name'.
---
gnu/services.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/services.scm b/gnu/services.scm
index 11ba21e..4b30399 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -461,7 +461,12 @@ channels in use and CONFIG-FILE, if it is true."
(mbegin %store-monad
(let ((config-file (cond ((string? config-file)
- (local-file config-file "configuration.scm"))
+ ;; CONFIG-FILE has been passed typically via
+ ;; 'guix system reconfigure CONFIG-FILE' so we
+ ;; can assume it's valid: tell 'local-file' to
+ ;; not emit a warning.
+ (local-file (assume-valid-file-name config-file)
+ "configuration.scm"))
((not config-file)
#f)
(else
- branch master updated (83fc59b -> 27913a6), guix-commits, 2020/10/16
- 01/10: nls: Update., guix-commits, 2020/10/16
- 04/10: guix-install.sh: Check the service 'nscd' and suggest it., guix-commits, 2020/10/16
- 05/10: .guix-authorizations: Add m1gu3l., guix-commits, 2020/10/16
- 06/10: gnu: julia: Update to 1.5.2., guix-commits, 2020/10/16
- 03/10: guix-install.sh: Add symbolic links for supported shell completions., guix-commits, 2020/10/16
- 07/10: gnu: runc, skopeo, docker-cli, umoci: Don't 'chdir' in build phases., guix-commits, 2020/10/16
- 10/10: gnu: gnuzilla: Use 'assume-valid-file-name' where appropriate., guix-commits, 2020/10/16
- 08/10: gexp: Add 'assume-valid-file-name' syntax for use with 'local-file'., guix-commits, 2020/10/16
- 09/10: services: provenance: Wrap config file name in 'assume-valid-file-name'.,
guix-commits <=
- 02/10: nls: Update manual translations., guix-commits, 2020/10/16