From 1567529b919280dcedc7e0ab483e211cb282b5a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 12 Sep 2025 16:33:58 +0200 Subject: [PATCH] =?UTF-8?q?services:=20secret-service:=20Remove=20redundan?= =?UTF-8?q?t=20=E2=80=98dump=E2=80=99=20procedure.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/build/secret-service.scm (secret-service-receive-secrets)[dump]: Remove. Use ‘dump-port’ from (guix build utils) instead. Change-Id: I5a098a6f4f6629cf275862e9f10c9a2718bb27a1 --- gnu/build/secret-service.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/build/secret-service.scm b/gnu/build/secret-service.scm index 615dd3535e4..b8cd77081ca 100644 --- a/gnu/build/secret-service.scm +++ b/gnu/build/secret-service.scm @@ -190,23 +190,6 @@ Return the list of files installed on success, and #f otherwise." (close-port sock) #f)))) - ;; TODO: Remove when (@ (guix build utils) dump-port) has a 'size' - ;; parameter. - (define (dump in out size) - ;; Copy SIZE bytes from IN to OUT. - (define buf-size 65536) - (define buf (make-bytevector buf-size)) - - (let loop ((left size)) - (if (<= left 0) - 0 - (let ((read (get-bytevector-n! in buf 0 (min left buf-size)))) - (if (eof-object? read) - left - (begin - (put-bytevector out buf 0 read) - (loop (- left read)))))))) - (define (read-secrets port) ;; Read secret files from PORT and install them. (match (false-if-exception (read port)) @@ -224,7 +207,7 @@ Return the list of files installed on success, and #f otherwise." (call-with-output-file file (lambda (output) - (dump port output size) + (dump-port port output size) (chmod file mode)))) files sizes modes) (log "received ~a secret files~%" (length files))