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

utils: 'cache-directory' always appends "/guix". 

Fixes <http://bugs.gnu.org/23836>.
Fixes a regression introduced in f10dcbf1a9.
Reported by myglc2 <myglc2@gmail.com>.

* guix/utils.scm (cache-directory): Always append "/guix".
This commit is contained in:
Ludovic Courtès 2016-06-25 00:58:48 +02:00
parent 25a3bfbe77
commit 934c5d5b28
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/utils.scm
View File

@ -637,10 +637,11 @@ output port, and PROC's result is returned."
(define (cache-directory) (define (cache-directory)
"Return the cache directory for Guix, by default ~/.cache/guix." "Return the cache directory for Guix, by default ~/.cache/guix."
(or (getenv "XDG_CACHE_HOME") (string-append (or (getenv "XDG_CACHE_HOME")
(and=> (or (getenv "HOME") (and=> (or (getenv "HOME")
(passwd:dir (getpwuid (getuid)))) (passwd:dir (getpwuid (getuid))))
(cut string-append <> "/.cache/guix")))) (cut string-append <> "/.cache")))
"/guix"))
(define (readlink* file) (define (readlink* file)
"Call 'readlink' until the result is not a symlink." "Call 'readlink' until the result is not a symlink."