diff --git a/base/arvo/clay.hoon b/base/arvo/clay.hoon index 523f37556..616ad2f2f 100644 --- a/base/arvo/clay.hoon +++ b/base/arvo/clay.hoon @@ -1068,9 +1068,9 @@ =+ vid=(read-at-aeon:ze u.nao p.q.i.xiq) :: ~& %red-at-aeon ?~ vid - ?~ u.nao + ?: =(0 u.nao) ~& [%oh-poor `path`[syd '0' r.p.q.i.xiq]] - $(xiq t.xiq) + $(xiq t.xiq) ~& [%oh-well desk=syd mood=p.q.i.xiq aeon=u.nao] $(xiq t.xiq, xaq [i.xiq xaq]) $(xiq t.xiq, ..wake (balk p.i.xiq u.vid p.q.i.xiq)) diff --git a/base/lib/kiln/core.hook b/base/lib/kiln/core.hook index 205a9b721..b9e19ec0e 100644 --- a/base/lib/kiln/core.hook +++ b/base/lib/kiln/core.hook @@ -129,7 +129,7 @@ %- flop =< acc %+ roll mes - =< .(eny eny) + =< .(eny ^eny) |= [tan=tank acc=(list thought:talk) eny=@uvI] ^- [acc=(list thought:talk) eny=@uvI] =+ (sham eny mes) @@ -172,7 +172,10 @@ %- blab :_ ~ :* ost %merg /kiln/sync/[syd]/(scot %p her)/[sud] - our syd her sud %mate + our syd her sud + ?: =(0 .^(%cw /(scot %p our)/[syd]/(scot %da lat))) + %init + %mate == :: ++ mere @@ -182,9 +185,9 @@ %- spam ?: ?=(%& -.mes) [leaf/"autosync succeeded from {} on {} to {}" ~] - :* leaf/"autsync faild from {} on {} to {}" + :* leaf/"autosync failed from {} on {} to {}" leaf/"please manually merge the desks with" - leaf/":helm+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}" + leaf/":+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}" leaf/"" leaf/"error code: {}" q.p.mes @@ -215,7 +218,7 @@ ++ lose ^+ . ~| %kiln-work-fail - !! + . :: ++ gage-to-tage :: |= res=gage