[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Update parse-commit for the guix-revision changes
From: |
Christopher Baines |
Subject: |
branch master updated: Update parse-commit for the guix-revision changes |
Date: |
Thu, 04 Feb 2021 05:28:18 -0500 |
This is an automated email from the git hooks/post-receive script.
cbaines pushed a commit to branch master
in repository data-service.
The following commit(s) were added to refs/heads/master by this push:
new 39f52e3 Update parse-commit for the guix-revision changes
39f52e3 is described below
commit 39f52e3a2ea126a08d60e087d1f6b83f8e00f5d4
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu Feb 4 10:28:04 2021 +0000
Update parse-commit for the guix-revision changes
---
guix-data-service/web/compare/controller.scm | 51 +++++++++++++++-------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/guix-data-service/web/compare/controller.scm
b/guix-data-service/web/compare/controller.scm
index a847a1b..a6aa198 100644
--- a/guix-data-service/web/compare/controller.scm
+++ b/guix-data-service/web/compare/controller.scm
@@ -57,30 +57,33 @@
(parallel-via-thread-pool-channel
(with-thread-postgresql-connection
(lambda (conn)
- (if (guix-commit-exists? conn s)
- s
- (let* ((job-details
- (select-job-for-commit conn s))
- (job-state
- (assq-ref job-details 'state)))
- (if job-details
- (make-invalid-query-parameter
- s
- (cond
- ((string=? job-state "queued")
- `("data unavailable, "
- (a (@ (href ,(string-append
- "/revision/" s)))
- "yet to process revision")))
- ((string=? job-state "failed")
- `("data unavailable, "
- (a (@ (href ,(string-append
- "/revision/" s)))
- "failed to process revision")))
- (else
- "unknown job state")))
- (make-invalid-query-parameter
- s "unknown commit"))))))))
+ (let* ((job-details
+ (select-job-for-commit conn s))
+ (job-state
+ (assq-ref job-details 'state)))
+ (if job-details
+ (cond
+ ((string=? job-state "succeeded")
+ s)
+ ((string=? job-state "queued")
+ (make-invalid-query-parameter
+ s
+ `("data unavailable, "
+ (a (@ (href ,(string-append
+ "/revision/" s)))
+ "yet to process revision"))))
+ ((string=? job-state "failed")
+ (make-invalid-query-parameter
+ s
+ `("data unavailable, "
+ (a (@ (href ,(string-append
+ "/revision/" s)))
+ "failed to process revision"))))
+ (else
+ (make-invalid-query-parameter
+ s "unknown job state")))
+ (make-invalid-query-parameter
+ s "unknown commit")))))))
(define (parse-derivation file-name)
(if (parallel-via-thread-pool-channel
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Update parse-commit for the guix-revision changes,
Christopher Baines <=