diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-03-16 18:13:02 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-03-16 18:34:53 +0100 |
| commit | 71e2065a38cf2641b7eb8c557b0f043f5a42a649 (patch) | |
| tree | 441454804855b4c78d4378652884af9f3c930d69 /tests | |
| parent | 1ac94ae1666b9f4a0991174fb43076d31be0ee72 (diff) | |
| download | patches-71e2065a38cf2641b7eb8c557b0f043f5a42a649.tar patches-71e2065a38cf2641b7eb8c557b0f043f5a42a649.tar.gz | |
substitute: Honor client-provided empty URL list.
Before that, 'guix build --substitute-urls=""' would lead to using the
daemon's own URL list instead of the empty list. The 'or*' hack, which
is to blame, had become unnecessary since commit
fb4bf72be3fbc23bca35ba4b842b7e1517ef0e3a.
Reported by Mark H Weaver <mhw@netris.org>.
* guix/scripts/substitute.scm (or*): Remove.
(%cache-urls): Use 'or' instead of 'or*'.
* tests/store.scm ("substitute query, alternating URLs"): Add test with
empty URL list.
* doc/guix.texi (Common Build Options): Mention the empty string.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/store.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/store.scm b/tests/store.scm index 3d32d52758..f7db7df966 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -450,7 +450,11 @@ (with-store s ;the right one again (set-build-options s #:use-substitutes? #t #:substitute-urls (%test-substitute-urls)) - (has-substitutes? s o)))))) + (has-substitutes? s o)) + (with-store s ;empty list of URLs + (set-build-options s #:use-substitutes? #t + #:substitute-urls '()) + (not (has-substitutes? s o))))))) (test-assert "substitute" (with-store s |