From 10dee5481f12a6f4a53afaacc27277ba9461ffc4 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 24 Oct 2020 14:49:38 +0100
Subject: Fix a few places where the client-option-defaults were missing

---
 scripts/guix-build-coordinator.in | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/guix-build-coordinator.in b/scripts/guix-build-coordinator.in
index 3a5663d..ae6e0d4 100644
--- a/scripts/guix-build-coordinator.in
+++ b/scripts/guix-build-coordinator.in
@@ -217,7 +217,8 @@
 (match (cdr (program-arguments))
   (("build" "show" rest ...)
    (let ((opts (parse-options %base-options
-                              %base-option-defaults
+                              (append %base-option-defaults
+                                      %client-option-defaults)
                               rest)))
      (define (display-build build-details)
        (simple-format #t "derivation name: ~A
@@ -296,7 +297,8 @@ processed?:      ~A
                            ,@response)))))))
   (("build" "show-blocking" rest ...)
    (let ((opts (parse-options %base-options
-                              %base-option-defaults
+                              (append %base-option-defaults
+                                      %client-option-defaults)
                               rest)))
      (let ((response (request-failed-builds-with-blocking-count-list
                       (assq-ref opts 'coordinator))))
@@ -312,6 +314,7 @@ processed?:      ~A
    (let ((opts (parse-options (append %build-options
                                       %base-options)
                               (append %build-option-defaults
+                                      %client-option-defaults
                                       %base-option-defaults)
                               rest)))
      (match (assq-ref opts 'arguments)
@@ -370,7 +373,8 @@ processed?:      ~A
                       (assoc-ref response "agent-id")))))
   (("agent" agent-id "password" "new" rest ...)
    (let ((opts (parse-options %base-options
-                              %base-option-defaults
+                              (append %client-option-defaults
+                                      %base-option-defaults)
                               rest)))
      (let ((response (send-create-agent-password-request
                       (assq-ref opts 'coordinator)
@@ -378,7 +382,10 @@ processed?:      ~A
        (simple-format #t "new password: ~A\n"
                       (assoc-ref response "new-password")))))
   (("agent" "list" rest ...)
-   (let ((opts (parse-options %base-options %base-option-defaults rest)))
+   (let ((opts (parse-options %base-options
+                              (append %base-option-defaults
+                                      %client-option-defaults)
+                              rest)))
      (for-each (lambda (agent)
                  (simple-format
                   #t "~A: ~A\n"
-- 
cgit v1.2.3