From c2933c017f291680b67a13ebd16df66038b5d1f2 Mon Sep 17 00:00:00 2001
From: Philip Monk <phil@pcmonk.me>
Date: Tue, 9 Nov 2021 23:49:37 -0800
Subject: [PATCH] kiln: don't bump suspended desks

---
 pkg/arvo/lib/hood/kiln.hoon | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkg/arvo/lib/hood/kiln.hoon b/pkg/arvo/lib/hood/kiln.hoon
index dad7d1cb8..b1c97ab4b 100644
--- a/pkg/arvo/lib/hood/kiln.hoon
+++ b/pkg/arvo/lib/hood/kiln.hoon
@@ -409,17 +409,7 @@
       ==
     take-commit:(abed:vats %base)
   =?  kiln  ?=(^ wef)
-    =/  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)
+    (bump:vats u.wef (get-unblockers ark.old) force=%.n)
   =.  wef  ~
   abet:kiln
 ::
@@ -928,7 +918,7 @@
       ?~  rail.rak         zuse/zuse
       ?~  next.u.rail.rak  zuse/zuse
       weft.i.next.u.rail.rak
-    (bump-many kel (all-desks-but (sy %base ~)))
+    (bump-many kel (all-desks-but (get-unblockers ark)))
   ::
   ++  take-merge-main
     |=  syn=sign-arvo
@@ -1043,6 +1033,19 @@
   ?:  (lien next.u.rail.arak |=([* k=weft] =(k kel)))
     ~
   `desk
+::  +get-unblockers: find desks which shouldn't block a kernel upgrade
+::
+++  get-unblockers
+  |=  ark=(map desk arak)
+  =/  base=(set desk)  (sy %base %kids ~)
+  %-  ~(gas in base)
+  %+  murn  ~(tap by ark)
+  |=  [loc=desk ark=arak]
+  ^-  (unit desk)
+  ?.  liv.rein.ark       `loc
+  ?~  rail.ark           `loc
+  ?:  paused.u.rail.ark  `loc
+  ~
 ::  +get-germ: select merge strategy into local desk
 ::
 ::  If destination desk doesn't exist, need a %init merge.  If this is