diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-10-16 14:57:25 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-10-16 15:00:50 +0200 |
| commit | 5dbfdf8be4dc6250ab8475874e232e653b042cbf (patch) | |
| tree | c0ea52ba760e2dbc80e95cad2f3fa3697e7203ba /gnu/services.scm | |
| parent | 5d4ad8e1be6d60c38577e2f3d92cc5642b12eff0 (diff) | |
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'.
Diffstat (limited to 'gnu/services.scm')
| -rw-r--r-- | gnu/services.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index 11ba21e8245..4b30399adca 100644 --- a/gnu/services.scm +++ b/gnu/services.scm | |||
| @@ -461,7 +461,12 @@ channels in use and CONFIG-FILE, if it is true." | |||
| 461 | 461 | ||
| 462 | (mbegin %store-monad | 462 | (mbegin %store-monad |
| 463 | (let ((config-file (cond ((string? config-file) | 463 | (let ((config-file (cond ((string? config-file) |
| 464 | (local-file config-file "configuration.scm")) | 464 | ;; CONFIG-FILE has been passed typically via |
| 465 | ;; 'guix system reconfigure CONFIG-FILE' so we | ||
| 466 | ;; can assume it's valid: tell 'local-file' to | ||
| 467 | ;; not emit a warning. | ||
| 468 | (local-file (assume-valid-file-name config-file) | ||
| 469 | "configuration.scm")) | ||
| 465 | ((not config-file) | 470 | ((not config-file) |
| 466 | #f) | 471 | #f) |
| 467 | (else | 472 | (else |
