diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-04-11 18:36:49 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-04-11 18:37:24 +0100 |
| commit | d679fe791aa8d3a8b9f6dac71bd736252885f8e6 (patch) | |
| tree | a9942b5119eb8606481d444188119e14fca9cdd6 | |
| parent | dd817097a387db05fbf8036855b7ea7304067e93 (diff) | |
| download | build-coordinator-d679fe791aa8d3a8b9f6dac71bd736252885f8e6.tar build-coordinator-d679fe791aa8d3a8b9f6dac71bd736252885f8e6.tar.gz | |
Use underscores for derivation_name
As this is more consistent in the JSON responses.
Signed-off-by: Christopher Baines <mail@cbaines.net>
| -rw-r--r-- | guix-build-coordinator/agent.scm | 8 | ||||
| -rw-r--r-- | guix-build-coordinator/datastore/sqlite.scm | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm index 067fa93..c7440c9 100644 --- a/guix-build-coordinator/agent.scm +++ b/guix-build-coordinator/agent.scm @@ -429,7 +429,9 @@ ~A" (assoc-ref build-details "uuid") (assoc-ref build-details "derived_priority") - (assoc-ref build-details "derivation-name")))) + (or + (assoc-ref build-details "derivation_name") + (assoc-ref build-details "derivation-name"))))) (list-jobs)) "\n") "\n" @@ -441,7 +443,9 @@ ~A" (assoc-ref build-details "uuid") (assoc-ref build-details "derived_priority") - (assoc-ref build-details "derivation-name")))) + (or + (assoc-ref build-details "derivation-name") + (assoc-ref build-details "derivation-name"))))) (list-post-build-jobs)) "\n"))) (current-error-port))) diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index f8c65c7..e39ba0d 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -3355,8 +3355,7 @@ WHERE build_derivation_outputs.derivation_id = :derivation_id (if (eq? #f result) `((uuid . ,uuid) - ;; TODO Change this to derivation_name - (derivation-name . ,derivation-name) + (derivation_name . ,derivation-name) (derived_priority . ,derived_priority)) (loop (sqlite-step statement)))))))) @@ -3508,8 +3507,7 @@ WHERE allocated_builds.agent_id = :agent_id" (match-lambda (#(uuid derivation_name derived_priority) `((uuid . ,uuid) - ;; TODO Switch this to derivation_name - (derivation-name . ,derivation_name) + (derivation_name . ,derivation_name) (derived_priority . ,derived_priority)))) statement))) (sqlite-reset statement) |