~ruther/guix-local

b55e3b1a4bcb8c098eac7ea958a642e1d1d6511b — Christopher Baines 1 year, 5 months ago 70b2b33
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
1 files changed, 6 insertions(+), 4 deletions(-)

M guix/scripts/publish.scm
M guix/scripts/publish.scm => guix/scripts/publish.scm +6 -4
@@ 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.