substitute: Honor client-provided empty URL list.
authorLudovic Courtès <ludo@gnu.org>
Wed, 16 Mar 2016 17:13:02 +0000 (18:13 +0100)
committerLudovic Courtès <ludo@gnu.org>
Wed, 16 Mar 2016 17:34:53 +0000 (18:34 +0100)
commit71e2065a38cf2641b7eb8c557b0f043f5a42a649
tree441454804855b4c78d4378652884af9f3c930d69
parent1ac94ae1666b9f4a0991174fb43076d31be0ee72
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.
doc/guix.texi
guix/scripts/substitute.scm
tests/store.scm