From 901bcdf7b8c908abba4547c4724a824e8efe450e Mon Sep 17 00:00:00 2001 From: Philip Monk Date: Fri, 12 Nov 2021 14:37:54 -0800 Subject: [PATCH] kiln: don't allow bump-many for non-current kelvin --- pkg/arvo/lib/hood/kiln.hoon | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon index 869c2bf625..9af10f1c9a 100644 --- a/pkg/arvo/lib/hood/kiln.hoon +++ b/pkg/arvo/lib/hood/kiln.hoon @@ -682,11 +682,9 @@ =/ ded (find-blocked kel except) =? kiln force (suspend-many ded) ?: |(force =(~ ded)) - =/ desks - ?: !=(zuse+zuse kel) - (sy %base ~) - (all-desks-but (~(uni in except) ded)) - (bump-many kel desks) + ?: !=(zuse+zuse kel) + (bump-one kel %base) + (bump-many (all-desks-but (~(uni in except) ded))) =- (^emit (pyre:pass leaf/- ~)) "kiln: desks blocked upgrade to {}: {}" :: @@ -706,7 +704,7 @@ $(ded t.ded, kiln abet:(suspend i.ded)) :: ++ bump-many - |= [kel=weft live=(set desk)] + |= live=(set desk) ^+ kiln :: ensure %base is always reloaded first :: @@ -720,7 +718,7 @@ :: |- ^+ kiln ?~ liv kiln - $(liv t.liv, kiln (bump-one kel i.liv)) + $(liv t.liv, kiln (bump-one zuse+zuse i.liv)) :: ++ bump-one |= [kel=weft =desk] @@ -914,7 +912,7 @@ update-running-dudes ?. =(%base loc) kiln - (bump-many zuse+zuse (all-desks-but (get-unblockers ark))) + (bump-many (all-desks-but (get-unblockers ark))) :: ++ take-merge-main |= syn=sign-arvo