diff options
| author | Christopher Baines <mail@cbaines.net> | 2025-03-03 19:50:13 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2025-03-03 20:14:54 +0000 |
| commit | b55e3b1a4bcb8c098eac7ea958a642e1d1d6511b (patch) | |
| tree | f159db728e7af1619d55542b03d4a39cd348e4e2 | |
| parent | 70b2b33054c6d43764075eeca979faf819071f71 (diff) | |
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
| -rw-r--r-- | guix/scripts/publish.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index a000c559a7..6f993ef0d6 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. |