urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-01 22:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Get clay building again / better %alts debugging

Browse Source
This commit is contained in:
Elliot Glaysher 2018-08-02 13:21:30 -07:00
parent f2c0d3289f
commit 4ecb004adc
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/vane/clay.hoon
View File

@ -2400,7 +2400,7 @@
:: we default to fully private (empty whitelist).
::
++ read-p
|= {aeon pax/path}
|= pax=path
^- (unit (unit (each cage lobe)))
=- [~ ~ %& %noun !>(-)]
:- (read-p-in pax per.red)

14
sys/vane/turbo.hoon
View File

@ -1703,7 +1703,7 @@
:: accessed-builds: builds accessed/depended on during this run.
::
=| accessed-builds=(list ^build)
:: ~& [%turbo-make (build-to-tape build)]
~& [%turbo-make (build-to-tape build)]
:: dispatch based on the kind of +schematic in :build
::
::
@ -1716,7 +1716,7 @@
%$ (make-literal literal)
::
%pin (make-pin date schematic)
%alts (make-alts choices)
%alts (make-alts choices ~)
%bake (make-bake renderer query-string path-to-render)
%bunt (make-bunt disc mark)
%call (make-call gate sample)
@ -1792,11 +1792,11 @@
[build [%build-result u.result] accessed-builds]
::
++ make-alts
|= choices=(list schematic)
|= [choices=(list schematic) errors=(list tank)]
^- build-receipt
::
?~ choices
(return-error [leaf+"%alts: all options failed"]~)
(return-error [[%leaf "%alts: all options failed"] errors])
::
=/ choice=^build [date.build i.choices]
::
@ -1805,6 +1805,12 @@
[build [%blocks ~[choice] ~] accessed-builds]
::
?: ?=([%error *] u.result)
:: TODO: When the type system wises up, fix this:
::
=/ braces [[' ' ' ' ~] ['{' ~] ['}' ~]]
=/ wrapped-error=tank
[%rose braces `(list tank)`message.u.result]
=. errors [[%leaf "option"] wrapped-error errors]
$(choices t.choices)
::
[build [%build-result %success %alts u.result] accessed-builds]