nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

store: Fix 'log-file' to support uncompressed logs. 

* guix/store.scm (log-file): Report the file without '.bz2' if it
  exists.
This commit is contained in:
Ludovic Courtès 2014-01-08 19:23:33 +01:00
parent 87236aed77
commit 021a201f29
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
guix/store.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -753,12 +753,15 @@ must be an absolute store file name, or a derivation file name."
(or (getenv "NIX_STATE_DIR") %state-directory)) (or (getenv "NIX_STATE_DIR") %state-directory))
(cond ((derivation-path? file) (cond ((derivation-path? file)
(let* ((base (basename file)) (let* ((base (basename file))
(log (string-append (dirname state-dir) ; XXX: ditto (log (string-append (dirname state-dir) ; XXX: ditto
"/log/nix/drvs/" "/log/nix/drvs/"
(string-take base 2) "/" (string-take base 2) "/"
(string-drop base 2) ".bz2"))) (string-drop base 2)))
(and (file-exists? log) log))) (log.bz2 (string-append log ".bz2")))
(cond ((file-exists? log.bz2) log.bz2)
((file-exists? log) log)
(else #f))))
(else (else
(match (valid-derivers store file) (match (valid-derivers store file)
((derivers ...) ((derivers ...)