diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:44:19 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-03-25 10:46:22 +0100 |
| commit | 614c2188420a266ec512c9c04af3bb2ea46c4dc4 (patch) | |
| tree | 43be5856ffcea6dbf00aedebea58a28eb04b79d2 | |
| parent | 2c74fde00e4e721c6a73646935ab0cfe19dd9188 (diff) | |
| download | patches-614c2188420a266ec512c9c04af3bb2ea46c4dc4.tar patches-614c2188420a266ec512c9c04af3bb2ea46c4dc4.tar.gz | |
substitute: Rename cache directory from "substitute-binary" to "substitute".
* 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.
| -rwxr-xr-x | guix/scripts/substitute.scm | 4 | ||||
| -rw-r--r-- | tests/store.scm | 2 | ||||
| -rw-r--r-- | tests/substitute.scm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index e99c29945c..adf94a7ac3 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -69,8 +69,8 @@ (define %narinfo-cache-directory ;; A local cache of narinfos, to avoid going to the network. (or (and=> (getenv "XDG_CACHE_HOME") - (cut string-append <> "/guix/substitute-binary")) - (string-append %state-directory "/substitute-binary/cache"))) + (cut string-append <> "/guix/substitute")) + (string-append %state-directory "/substitute/cache"))) (define %allow-unauthenticated-substitutes? ;; Whether to allow unchecked substitutes. This is useful for testing diff --git a/tests/store.scm b/tests/store.scm index 8e929bbc4d..f778c2086d 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -372,7 +372,7 @@ ;; Remove entry from the local cache. (false-if-exception (delete-file (string-append (getenv "XDG_CACHE_HOME") - "/guix/substitute-binary/" + "/guix/substitute/" (store-path-hash-part o)))) ;; Make sure 'guix substitute' correctly communicates the above diff --git a/tests/substitute.scm b/tests/substitute.scm index 5697592423..85698127fa 100644 --- a/tests/substitute.scm +++ b/tests/substitute.scm @@ -132,7 +132,7 @@ a file for NARINFO." "GUIX_BINARY_SUBSTITUTE_URL")) uri-path)) (cache-directory (string-append (getenv "XDG_CACHE_HOME") - "/guix/substitute-binary/"))) + "/guix/substitute/"))) (dynamic-wind (lambda () (when (file-exists? cache-directory) |