me
/
guix
Archived
1
0
Fork 0
Code

substitute: Do not exit when failing to find a nar. 

Fixes <https://issues.guix.gnu.org/67575>.

* guix/scripts/substitute.scm (process-substitution/fallback): Use
‘report-error’ instead of ‘leave’.  Write status line to PORT.
* tests/substitute.scm ("substitute, narinfo is available but nar is
missing"): Adjust accordingly.

Change-Id: Ic7297dbd563c007111ec2167c8d52505a07d4822
Ludovic Courtès 2023-12-02 12:04:23 +01:00
parent d83d4488da
commit 06b9c1260c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/scripts/substitute.scm
View File

@ -635,8 +635,9 @@ way to download the nar."
(let loop ((cache-urls cache-urls)) (let loop ((cache-urls cache-urls))
(match cache-urls (match cache-urls
(() (()
(leave (G_ "failed to find alternative substitute for '~a'~%") (report-error (G_ "failed to find alternative substitute for '~a'~%")
(narinfo-path narinfo))) (narinfo-path narinfo))
(display "not-found\n" port))
((cache-url rest ...) ((cache-url rest ...)
(match (lookup-narinfos cache-url (match (lookup-narinfos cache-url
(list (narinfo-path narinfo)) (list (narinfo-path narinfo))

45
tests/substitute.scm
View File

@ -662,28 +662,31 @@ System: mips64el-linux\n")))
(lambda () (lambda ()
(false-if-exception (delete-file "substitute-retrieved"))))))) (false-if-exception (delete-file "substitute-retrieved")))))))
(test-quit "substitute, narinfo is available but nar is missing" (test-equal "substitute, narinfo is available but nar is missing"
"failed to find alternative substitute" "not-found\n"
(with-narinfo* (let ((port (open-output-string)))
(string-append %narinfo "Signature: " (parameterize ((current-output-port port))
(signature-field (with-narinfo*
%narinfo (string-append %narinfo "Signature: "
#:public-key %wrong-public-key)) (signature-field
%main-substitute-directory %narinfo
#:public-key %wrong-public-key))
%main-substitute-directory
(with-http-server `((200 ,(string-append %narinfo "Signature: " (with-http-server `((200 ,(string-append %narinfo "Signature: "
(signature-field %narinfo))) (signature-field %narinfo)))
(404 "Sorry, nar is missing!")) (404 "Sorry, nar is missing!"))
(parameterize ((substitute-urls (parameterize ((substitute-urls
(list (%local-url) (list (%local-url)
(string-append "file://" (string-append "file://"
%main-substitute-directory)))) %main-substitute-directory))))
(delete-file (string-append %main-substitute-directory (delete-file (string-append %main-substitute-directory
"/example.nar")) "/example.nar"))
(request-substitution (string-append (%store-prefix) (request-substitution (string-append (%store-prefix)
"/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo") "/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-foo")
"substitute-retrieved") "substitute-retrieved")
(not (file-exists? "substitute-retrieved")))))) (and (not (file-exists? "substitute-retrieved"))
(get-output-string port))))))))
(test-equal "substitute, first narinfo is unsigned and has wrong hash" (test-equal "substitute, first narinfo is unsigned and has wrong hash"
"Substitutable data." "Substitutable data."