guix
/
data-service
mirror of git://git.savannah.gnu.org/guix/data-service.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Better guard against errors in packages when loading revisions 

In particular, things like undefined variables in the package
definition.
This commit is contained in:
Christopher Baines 2019-03-15 09:31:08 +00:00
parent d2697d8dd2
commit c4c1f15050
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
guix-data-service/jobs/load-new-guix-revision.scm
View File

@ -30,32 +30,41 @@
`(lambda (store)
(append-map
(lambda (inferior-package-id)
(let* ((package
(hashv-ref %package-table inferior-package-id))
(supported-systems
(package-transitive-supported-systems package)))
(append-map
(lambda (system)
(filter-map
(lambda (target)
(catch
'misc-error
(lambda ()
(guard (c ((package-cross-build-system-error? c)
#f))
(list inferior-package-id
system
target
(derivation-file-name
(if (string=? system target)
(package-derivation store package system)
(package-cross-derivation store package
target
system))))))
(lambda args
#f)))
supported-systems))
supported-systems)))
(let ((package (hashv-ref %package-table inferior-package-id)))
(catch
#t
(lambda ()
(let ((supported-systems
(package-transitive-supported-systems package)))
(append-map
(lambda (system)
(filter-map
(lambda (target)
(catch
'misc-error
(lambda ()
(guard (c ((package-cross-build-system-error? c)
#f))
(list inferior-package-id
system
target
(derivation-file-name
(if (string=? system target)
(package-derivation store package system)
(package-cross-derivation store package
target
system))))))
(lambda args
;; misc-error #f ~A ~S (No cross-compilation for clojure-build-system yet:
#f)))
supported-systems))
supported-systems)))
(lambda args
(simple-format (current-error-port)
"error: while processing ~A ignoring error: ~A\n"
(package-name package)
args)
'()))))
(list ,@(map inferior-package-id packages)))))
(inferior-eval-with-store inf store proc))