diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-12-17 19:18:44 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-12-17 19:18:44 +0000 |
| commit | e4799b81a9f9a986fc510390d84f2d05b7974656 (patch) | |
| tree | d366012a0bbf6325e62143d442827754527ed5a8 /guix-qa-frontpage | |
| parent | 8eaee93f94591f0e55488aa0d4e6f97746b2b587 (diff) | |
| download | qa-frontpage-e4799b81a9f9a986fc510390d84f2d05b7974656.tar qa-frontpage-e4799b81a9f9a986fc510390d84f2d05b7974656.tar.gz | |
Revert "Fix a couple of undefined variables"
This reverts commit 439a6a8a2ef9aa3e6541f7077070255b5db1e1be.
Diffstat (limited to 'guix-qa-frontpage')
| -rw-r--r-- | guix-qa-frontpage/guix-data-service.scm | 21 | ||||
| -rw-r--r-- | guix-qa-frontpage/manage-builds.scm | 6 |
2 files changed, 26 insertions, 1 deletions
diff --git a/guix-qa-frontpage/guix-data-service.scm b/guix-qa-frontpage/guix-data-service.scm index d931c3f..422cabf 100644 --- a/guix-qa-frontpage/guix-data-service.scm +++ b/guix-qa-frontpage/guix-data-service.scm @@ -26,6 +26,8 @@ guix-data-service-error->sexp guix-data-service-error-summary + guix-data-service-error-sexp->error + guix-data-service-error-invalid-query? guix-data-service-request @@ -150,6 +152,25 @@ (else (simple-format #f "~A" (guix-data-service-error-response-body exn))))) +(define (guix-data-service-error-sexp->error sexp) + (make-guix-data-service-error + (if (eq? (assq-ref sexp 'exception) + 'guix-data-service-invalid-parameters) + `(("error" . "invalid-query") + ,@sexp) + sexp) + #f + #f)) + +(define (guix-data-service-error-invalid-query? exn) + (and + (guix-data-service-error? exn) + (string=? + (or (assoc-ref (guix-data-service-error-response-body exn) + "error") + "") + "invalid-query"))) + (define* (guix-data-service-request url #:key (retry-times 0) (retry-delay 5)) (define (make-request) (let ((port diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm index 6039ef8..e55c27c 100644 --- a/guix-qa-frontpage/manage-builds.scm +++ b/guix-qa-frontpage/manage-builds.scm @@ -295,7 +295,11 @@ (lambda () (let ((data (branch-derivation-changes-data revisions system))) - (assoc-ref data "derivation_changes"))) + (if (assq-ref data 'exception) + (raise-exception + (guix-data-service-error-sexp->error data)) + (assoc-ref data "derivation_changes")))) + #:no-retry guix-data-service-error-invalid-query? #:times 2 #:delay 15)) %systems-to-submit-builds-for)) |