2
0
Fork 0
mirror of git://git.savannah.gnu.org/guix/data-service.git synced 2023-12-14 03:23:03 +01:00

Handle failures in load-new-guix-revision

Currently, I think the desired commit can be missing, if patches come
in gradually, and the series changes after the first laminar job has
been run. Therefore, try to ignore some errors and just delete the
job.
This commit is contained in:
Christopher Baines 2019-03-01 07:29:49 +00:00
parent 6d0eaab4e7
commit 853a2e4125
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577

View file

@ -108,11 +108,17 @@
(derivation->output-path derivation))) (derivation->output-path derivation)))
(define (channel->guix-store-item store channel) (define (channel->guix-store-item store channel)
(dirname (catch
(readlink #t
(string-append (channel->manifest-store-item store (lambda ()
channel) (dirname
"/bin")))) (readlink
(string-append (channel->manifest-store-item store
channel)
"/bin"))))
(lambda args
(simple-format #t "guix-data-service: load-new-guix-revision: error: ~A\n" args)
#f)))
(define (extract-information-from store conn url commit store_path) (define (extract-information-from store conn url commit store_path)
(let ((inf (open-inferior/container store store_path (let ((inf (open-inferior/container store store_path
@ -144,7 +150,8 @@
(channel (name 'guix) (channel (name 'guix)
(url url) (url url)
(commit commit))))) (commit commit)))))
(extract-information-from store conn url commit store-item))))) (and store-item
(extract-information-from store conn url commit store-item))))))
(define (select-job-for-commit conn commit) (define (select-job-for-commit conn commit)
(let ((result (let ((result