Merge pull request #6721 from silnem2/fix-uninstall

kiln: have +poke-uninstall unsync desks with %dead zest
This commit is contained in:
Pyry Kovanen 2023-07-24 16:14:18 +03:00 committed by GitHub
commit 8ae1b5be89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -795,7 +795,7 @@
%+ turn %+ turn
%+ skim desks %+ skim desks
|= dek=desk |= dek=desk
?: (~(has in .^((set desk) %cd /(scot %p our)/base/(scot %da now))) dek) ?: (~(has in .^((set desk) %cd /(scot %p our)//(scot %da now))) dek)
& &
~> %slog.(fmt "desk does not yet exist: {<dek>}") | ~> %slog.(fmt "desk does not yet exist: {<dek>}") |
|=(=desk [%pass /kiln/suspend %arvo %c %zest desk %dead]) |=(=desk [%pass /kiln/suspend %arvo %c %zest desk %dead])
@ -821,10 +821,9 @@
=+ .^(=rock:tire %cx /(scot %p our)//(scot %da now)/tire) =+ .^(=rock:tire %cx /(scot %p our)//(scot %da now)/tire)
?~ got=(~(get by rock) loc) ?~ got=(~(get by rock) loc)
abet:(spam leaf+"desk does not exist: {<loc>}" ~) abet:(spam leaf+"desk does not exist: {<loc>}" ~)
?: =(+<:got %dead)
abet:(spam leaf+"desk not installed: {<loc>}" ~)
~> %slog.(fmt "uninstalling {<loc>}") ~> %slog.(fmt "uninstalling {<loc>}")
=. ..on-init (emit %pass /kiln/uninstall %arvo %c %zest loc %dead) =? ..on-init !=(+<:got %dead)
(emit %pass /kiln/uninstall %arvo %c %zest loc %dead)
?~ sync=(~(get by sources) loc) ?~ sync=(~(get by sources) loc)
abet abet
(poke-unsync loc u.sync) (poke-unsync loc u.sync)