summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-10-19 23:12:34 +0200
committerLudovic Courtès <ludo@gnu.org>2015-10-19 23:12:34 +0200
commitea0c6e0507a6997f12a4f29d0445b51cf53bd81e (patch)
treeb16b754020bdd57ae447e253e9d9a473e9d30d57
parentc6f8e9dd64feb1ad174201277cf2ad0784f7d001 (diff)
downloadpatches-ea0c6e0507a6997f12a4f29d0445b51cf53bd81e.tar
patches-ea0c6e0507a6997f12a4f29d0445b51cf53bd81e.tar.gz
substitute: Expose narinfo access.
* guix/scripts/substitute.scm: Export <narinfo> accessors. (narinfo-hash->sha256): New procedure. (cache-narinfo!): Ignore EACCES exceptions.
-rwxr-xr-xguix/scripts/substitute.scm40
1 files changed, 36 insertions, 4 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index ec8e6244af..8967fa062e 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -53,6 +53,25 @@
#:use-module (web response)
#:use-module (guix http-client)
#:export (narinfo-signature->canonical-sexp
+
+ narinfo?
+ narinfo-path
+ narinfo-uri
+ narinfo-uri-base
+ narinfo-compression
+ narinfo-file-hash
+ narinfo-file-size
+ narinfo-hash
+ narinfo-size
+ narinfo-references
+ narinfo-deriver
+ narinfo-system
+ narinfo-signature
+
+ narinfo-hash->sha256
+ assert-valid-narinfo
+
+ lookup-narinfos
read-narinfo
write-narinfo
guix-substitute))
@@ -231,6 +250,12 @@ object on success, or #f on failure."
;; for more information.
(contents narinfo-contents))
+(define (narinfo-hash->sha256 hash)
+ "If the string HASH denotes a sha256 hash, return it as a bytevector.
+Otherwise return #f."
+ (and (string-prefix? "sha256:" hash)
+ (nix-base32-string->bytevector (string-drop hash 7))))
+
(define (narinfo-signature->canonical-sexp str)
"Return the value of a narinfo's 'Signature' field as a canonical sexp."
(match (string-split str #\;)
@@ -429,10 +454,17 @@ may be #f, in which case it indicates that PATH is unavailable at CACHE-URL."
(value ,(and=> narinfo narinfo->string))))
(let ((file (narinfo-cache-file cache-url path)))
- (mkdir-p (dirname file))
- (with-atomic-file-output file
- (lambda (out)
- (write (cache-entry cache-url narinfo) out))))
+ (catch 'system-error
+ (lambda ()
+ (mkdir-p (dirname file))
+ (with-atomic-file-output file
+ (lambda (out)
+ (write (cache-entry cache-url narinfo) out))))
+ (lambda args
+ ;; We may not have write access to the local cache when called from an
+ ;; unprivileged process such as 'guix challenge'.
+ (unless (= EACCES (system-error-errno args))
+ (apply throw args)))))
narinfo)