From b55e3b1a4bcb8c098eac7ea958a642e1d1d6511b Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 3 Mar 2025 19:50:13 +0000 Subject: [PATCH] publish: Call (current-processor-count) later. So that this is evaluated when the main part of the script runs. I'm looking at this to allow using setaffinity in the publish tests. * guix/scripts/publish.scm (%default-options): Remove workers default. (guix-publish): Move the default to here. Change-Id: I83cd0d048f2641291b5bd8a932b479b23dd92d29 --- guix/scripts/publish.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index a000c559a723245c09363b823ef8d01ac2112101..6f993ef0d64503a7d3d0e11c14c907d0cc975f55 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -256,9 +256,6 @@ usage." (public-key-file . ,%public-key-file) (private-key-file . ,%private-key-file) - ;; Default number of workers when caching is enabled. - (workers . ,(current-processor-count)) - (address . ,(make-socket-address AF_INET INADDR_ANY 0)) (repl . #f))) @@ -1272,7 +1269,12 @@ return the corresponding socket. Otherwise return #f." (nar-path (assoc-ref opts 'nar-path)) (repl-port (assoc-ref opts 'repl)) (cache (assoc-ref opts 'cache)) - (workers (assoc-ref opts 'workers)) + (workers (or (assoc-ref opts 'workers) + ;; Default number of workers when caching is + ;; enabled. Do this here to delay calling + ;; (current-processor-count) until guix-publish is + ;; called + (current-processor-count))) ;; Read the key right away so that (1) we fail early on if we can't ;; access them, and (2) we can then drop privileges.