[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: store: 'log-file' honors 'GUIX_LOG_DIRECTORY'.
From: |
guix-commits |
Subject: |
05/05: store: 'log-file' honors 'GUIX_LOG_DIRECTORY'. |
Date: |
Sun, 3 Feb 2019 18:03:40 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 7c4700e9f9c290ecc08a4da41534063565fccb25
Author: Ludovic Courtès <address@hidden>
Date: Sun Feb 3 22:32:13 2019 +0100
store: 'log-file' honors 'GUIX_LOG_DIRECTORY'.
* guix/store.scm (derivation-log-file): Use %LOCALSTATEDIR or
"GUIX_LOG_DIRECTORY" instead of (dirname %STATE-DIRECTORY).
---
guix/store.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/guix/store.scm b/guix/store.scm
index d079147..0a0a7c7 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -1856,8 +1856,9 @@ syntactically valid store path."
"Return the build log file for DRV, a derivation file name, or #f if it
could not be found."
(let* ((base (basename drv))
- (log (string-append (dirname %state-directory) ; XXX
- "/log/guix/drvs/"
+ (log (string-append (or (getenv "GUIX_LOG_DIRECTORY")
+ (string-append %localstatedir
"/log/guix"))
+ "/drvs/"
(string-take base 2) "/"
(string-drop base 2)))
(log.gz (string-append log ".gz"))
- branch master updated (6bb5f88 -> 7c4700e), guix-commits, 2019/02/03
- 05/05: store: 'log-file' honors 'GUIX_LOG_DIRECTORY'.,
guix-commits <=
- 01/05: doc: Show how to install Emacs, Guile, and Geiser., guix-commits, 2019/02/03
- 03/05: self: Ensure the daemon refers to the right 'guix' command., guix-commits, 2019/02/03
- 02/05: daemon: Rename 'NIX_STATE_DIR' and 'NIX_DB_DIR' environment variables., guix-commits, 2019/02/03
- 04/05: daemon: Remove unused 'NIX_DATA_DIR' environment variable., guix-commits, 2019/02/03