aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-10-16 14:57:25 +0200
committerLudovic Courtès <ludo@gnu.org>2020-10-16 15:00:50 +0200
commit5dbfdf8be4dc6250ab8475874e232e653b042cbf (patch)
treec0ea52ba760e2dbc80e95cad2f3fa3697e7203ba
parent5d4ad8e1be6d60c38577e2f3d92cc5642b12eff0 (diff)
downloadguix-5dbfdf8be4dc6250ab8475874e232e653b042cbf.tar.gz
guix-5dbfdf8be4dc6250ab8475874e232e653b042cbf.zip
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'.
-rw-r--r--gnu/services.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/services.scm b/gnu/services.scm
index 11ba21e824..4b30399adc 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