publish: Fix public-key rendering.

--public-key is currenlty ignored when passed to render-signing-key.

* guix/scripts/publish.scm (%public-key-file-in-use): New variable.
(render-signing-key): Ensure --public-key is read.
(guix-publish): Parameterize %public-key-file-in-use.

Fixes: guix/guix#10533
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #10534

1 files changed, 6 insertions, 1 deletions

diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index b51fbbadae1..6f213234e35 100644
--- a/guix/scripts/publish.scm
+++ b/guix/scripts/publish.scm
@@ -265,6 +265,9 @@ usage."
 (define %public-key
   (make-parameter #f))
 
+(define %public-key-file-in-use
+  (make-parameter %public-key-file))
+
 (define %nix-cache-info
   `(("StoreDir" . ,%store-directory)
     ("WantMassQuery" . 0)
@@ -793,7 +796,7 @@ to compress or decompress the log file; just return it as-is."
 
 (define (render-signing-key)
   "Render signing key."
-  (let ((file %public-key-file))
+  (let ((file (%public-key-file-in-use)))
     (values `((content-type . (text/plain (charset . "UTF-8")))
               (x-raw-file . ,file))
             file)))
@@ -1309,6 +1312,8 @@ because service is listening to localhost~%")))
 
       (parameterize ((%public-key public-key)
                      (%private-key private-key)
+                     (%public-key-file-in-use
+                      (assoc-ref opts 'public-key-file))
                      (cache-bypass-threshold
                       (or (assoc-ref opts 'cache-bypass-threshold)
                           (cache-bypass-threshold))))