Merge pull request #5410 from urbit/lf/fix-kelvin

kiln: fix crashing when reloading kiln after a new kelvin
This commit is contained in:
fang 2021-11-09 23:32:48 +01:00 committed by GitHub
commit 5a42734699
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions

View File

@ -409,7 +409,16 @@
==
take-commit:(abed:vats %base)
=? kiln ?=(^ wef)
=/ except=(set desk) (sy %base %kids ~)
=/ except=(set desk)
=/ base=(set desk) (sy %base %kids ~)
%- ~(gas in base)
%+ murn ~(tap by ark.old)
|= [loc=desk ark=arak]
^- (unit desk)
?. liv.rein.ark `loc
?~ rail.ark `loc
?: paused.u.rail.ark `loc
~
(bump:vats u.wef except force=%.n)
=. wef ~
abet:kiln
@ -605,7 +614,7 @@
vats
~> %slog.(fmt "{<lac>} pausing updates")
=/ rel ral
=. rail.rak `rel(paused &, aeon 0)
=. rail.rak `rel(paused &, aeon 0, next ~)
vats
::
:: +gall-lyv: watch gall source for reloading

View File

@ -225,6 +225,7 @@
++ get-apps-want
|= [duz=(list dude) =rein]
^- (list dude)
?. liv.rein ~
=. duz (skip duz ~(has in sub.rein))
=. duz (weld duz (skip ~(tap in add.rein) ~(has in (sy duz))))
duz