02/06: download: "GUIX_DOWNLOAD_FALLBACK_TEST=none" disables fallback mechanisms.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit bd61d62182bfda4a695757ec66810b28e8e1a6d0
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Oct 15 22:21:02 2021 +0200

    download: "GUIX_DOWNLOAD_FALLBACK_TEST=none" disables fallback mechanisms.
    
    * guix/download.scm (url-fetch*): Handle (%download-fallback-test) set
    to 'none.
---
 guix/download.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/guix/download.scm b/guix/download.scm
index d5351d0..4e219c9 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -472,6 +472,8 @@ download by itself using its own dependencies."
   ;;   - #f, to use the normal download methods, not trying to exercise the
   ;;     fallback mechanism;
   ;;
+  ;;   - 'none, to disable all the fallback mechanisms;
+  ;;
   ;;   - 'content-addressed-mirrors, to purposefully attempt to download from
   ;;     a content-addressed mirror;
   ;;
@@ -517,9 +519,9 @@ name in the store."
             (error "'guix-daemon' is too old, please upgrade" builtins))
 
           (built-in-download (or name file-name)
-                             (if (%download-fallback-test)
-                                 "https://example.org/does-not-exist";
-                                 url)
+                             (match (%download-fallback-test)
+                               ((or #f 'none) url)
+                               (_ "https://example.org/does-not-exist";))
                              #:guile guile
                              #:system system
                              #:hash-algo hash-algo