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

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 934c5d5b28f74ab2fe187ad727e4b56cfda6def8
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jun 25 00:58:48 2016 +0200

    utils: 'cache-directory' always appends "/guix".
    
    Fixes <http://bugs.gnu.org/23836>.
    Fixes a regression introduced in f10dcbf1a92c147a2fedba6f774afa6a7013fcdf.
    Reported by myglc2 <address@hidden>.
    
    * guix/utils.scm (cache-directory): Always append "/guix".
---
 guix/utils.scm |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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