diff options
Diffstat (limited to 'guix-qa-frontpage/server.scm')
-rw-r--r-- | guix-qa-frontpage/server.scm | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/guix-qa-frontpage/server.scm b/guix-qa-frontpage/server.scm index 65c5330..15a5052 100644 --- a/guix-qa-frontpage/server.scm +++ b/guix-qa-frontpage/server.scm @@ -40,6 +40,7 @@ #:use-module (guix-qa-frontpage issue) #:use-module (guix-qa-frontpage git-repository) #:use-module (guix-qa-frontpage manage-builds) + #:use-module (guix-qa-frontpage manage-patch-branches) #:use-module (guix-qa-frontpage guix-data-service) #:use-module (guix-qa-frontpage view util) #:use-module (guix-qa-frontpage view home) @@ -296,26 +297,29 @@ change-details (call-with-values (lambda () - (and=> (patch-series-derivation-changes-url - number - #:systems %systems-to-submit-builds-for) - (lambda (url) - (with-exception-handler - (lambda (exn) - (simple-format - (current-error-port) - "exception fetching derivation changes: ~A\n" - exn) + (and=> + (get-issue-branch-base-and-target-refs number) + (lambda (base-and-target-refs) + (with-exception-handler + (lambda (exn) + (simple-format + (current-error-port) + "exception fetching derivation changes: ~A\n" + exn) - (values #f #f)) - (lambda () - (with-sqlite-cache - database - 'derivation-changes - patch-series-derivation-changes - #:args (list url) - #:ttl 6000)) - #:unwind? #t)))) + (values #f #f)) + (lambda () + (with-sqlite-cache + database + 'derivation-changes + patch-series-derivation-changes + #:args + (list + (patch-series-derivation-changes-url + base-and-target-refs + #:systems %systems-to-submit-builds-for)) + #:ttl 6000)) + #:unwind? #t)))) (lambda res (match res ((#f) @@ -453,15 +457,16 @@ port. Also, the port used can be changed by passing the --port option.\n" #f) (lambda () (and=> - (patch-series-derivation-changes-url - (car series) - #:systems %systems-to-submit-builds-for) - (lambda (url) + (get-issue-branch-base-and-target-refs (car series)) + (lambda (base-and-target-refs) (with-sqlite-cache database 'derivation-changes patch-series-derivation-changes - #:args (list url) + #:args + (list (patch-series-derivation-changes-url + base-and-target-refs + #:systems %systems-to-submit-builds-for)) #:ttl (* 60 20))))) #:unwind? #t))) |