ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

substitute: Rename cache directory from "substitute-binary" to "substitute".

Browse source 
* guix/scripts/substitute.scm (%narinfo-cache-directory): Change
  "substitute-binary" to "substitute".
* tests/store.scm ("substitute query"): Likewise.
* tests/substitute.scm (call-with-narinfo): Likewise.
This commit is contained in:
Ludovic Courtès 2015-03-25 10:44:19 +01:00
parent 2c74fde00e
commit 614c218842
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/scripts/substitute.scm
View file

@ -69,8 +69,8 @@ (define-module (guix scripts substitute)
(define %narinfo-cache-directory (define %narinfo-cache-directory
;; A local cache of narinfos, to avoid going to the network. ;; A local cache of narinfos, to avoid going to the network.
(or (and=> (getenv "XDG_CACHE_HOME") (or (and=> (getenv "XDG_CACHE_HOME")
(cut string-append <> "/guix/substitute-binary")) (cut string-append <> "/guix/substitute"))
(string-append %state-directory "/substitute-binary/cache"))) (string-append %state-directory "/substitute/cache")))
(define %allow-unauthenticated-substitutes? (define %allow-unauthenticated-substitutes?
;; Whether to allow unchecked substitutes. This is useful for testing ;; Whether to allow unchecked substitutes. This is useful for testing

2
tests/store.scm
View file

@ -372,7 +372,7 @@ (define (same? x y)
;; Remove entry from the local cache. ;; Remove entry from the local cache.
(false-if-exception (false-if-exception
(delete-file (string-append (getenv "XDG_CACHE_HOME") (delete-file (string-append (getenv "XDG_CACHE_HOME")
"/guix/substitute-binary/" "/guix/substitute/"
(store-path-hash-part o)))) (store-path-hash-part o))))
;; Make sure 'guix substitute' correctly communicates the above ;; Make sure 'guix substitute' correctly communicates the above

2
tests/substitute.scm
View file

@ -132,7 +132,7 @@ (define (call-with-narinfo narinfo thunk)
"GUIX_BINARY_SUBSTITUTE_URL")) "GUIX_BINARY_SUBSTITUTE_URL"))
uri-path)) uri-path))
(cache-directory (string-append (getenv "XDG_CACHE_HOME") (cache-directory (string-append (getenv "XDG_CACHE_HOME")
"/guix/substitute-binary/"))) "/guix/substitute/")))
(dynamic-wind (dynamic-wind
(lambda () (lambda ()
(when (file-exists? cache-directory) (when (file-exists? cache-directory)