guix-commits
[Top][All Lists]
Advanced

[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



reply via email to

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