guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Ludovic Courtès
Date: Sat, 17 Mar 2018 20:12:28 -0400 (EDT)

branch: master
commit 787969c9af165113f67903173e3feb1a3e50f703
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 18 01:01:12 2018 +0100

    http: Correctly set #:timestamp for non-finished builds.
    
    Fixes a regression introduced in
    f083282fd3bf813fda0b54ed33278d2d5325dfa1, whereby we'd return 0 as the
    timestamp for everything in /api/queue.
    
    * src/cuirass/http.scm (build->hydra-build): Make 'finished?' a
    Boolean.  Move 'bool->int' call in #:finished definition.
---
 src/cuirass/http.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/cuirass/http.scm b/src/cuirass/http.scm
index 9a379da..3d9ce5a 100644
--- a/src/cuirass/http.scm
+++ b/src/cuirass/http.scm
@@ -36,10 +36,9 @@
     (if bool 1 0))
 
   (define finished?
-    (bool->int
-     (not (memv (assq-ref build #:status)
-                (list (build-status scheduled)
-                      (build-status started))))))
+    (not (memv (assq-ref build #:status)
+               (list (build-status scheduled)
+                     (build-status started)))))
 
   `((#:id . ,(assq-ref build #:id))
     (#:project . ,(assq-ref build #:repo-name))
@@ -62,7 +61,7 @@
     (#:busy . ,(bool->int (eqv? (build-status started)
                                 (assq-ref build #:status))))
     (#:priority . 0)
-    (#:finished . ,finished?)
+    (#:finished . ,(bool->int finished?))
     (#:buildproducts . #nil)
     (#:releasename . #nil)
     (#:buildinputs_builds . #nil)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]