summaryrefslogtreecommitdiff
path: root/guix/status.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-09-28 23:19:13 +0200
committerLudovic Courtès <ludo@gnu.org>2018-09-28 23:28:03 +0200
commitfb94d82bc2dc8eec35520bc2b6101ab8aaf0a4a7 (patch)
treef1e032e1593d0d1026015442401679a9e7cacdb1 /guix/status.scm
parent258a6d944ed891fa92fa87a16731e5dfe0bac477 (diff)
downloadgnu-guix-fb94d82bc2dc8eec35520bc2b6101ab8aaf0a4a7.tar
gnu-guix-fb94d82bc2dc8eec35520bc2b6101ab8aaf0a4a7.tar.gz
status: Be more defensive when looking for a log file.
* guix/store.scm (derivation-log-file): New procedure.o (log-file): Use it. * guix/status.scm (print-build-event): Use 'derivation-log-file' instead of 'log-file'. Check wheter the return value is #f.
Diffstat (limited to 'guix/status.scm')
-rw-r--r--guix/status.scm14
1 files changed, 8 insertions, 6 deletions
diff --git a/guix/status.scm b/guix/status.scm
index 94d4748af5..afa3c656a8 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -24,10 +24,7 @@
#:autoload (guix build syscalls) (terminal-columns)
#:use-module ((guix build download)
#:select (nar-uri-abbreviation))
- #:use-module ((guix store)
- #:select (current-build-output-port
- current-store-protocol-version
- log-file))
+ #:use-module (guix store)
#:use-module (guix derivations)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-9)
@@ -334,8 +331,13 @@ addition to build events."
(('build-failed drv . _)
(format port (failure (G_ "build of ~a failed")) drv)
(newline port)
- (format port (info (G_ "View build log at '~a'.~%"))
- (log-file #f drv)))
+ (match (derivation-log-file drv)
+ (#f
+ (format port (failure (G_ "Could not find build log for '~a'."))
+ drv))
+ (log
+ (format port (info (G_ "View build log at '~a'.")) log)))
+ (newline port))
(('substituter-started item _ ...)
(when (or print-log? (not (extended-build-trace-supported?)))
(format port (info (G_ "substituting ~a...")) item)