kiln: fix |bump to not require except

pkg/arvo/lib/hood/kiln.hoon

@@ -408,18 +408,6 @@
           .^([rev=@ud @da] %cw /(scot %p our)/[d]/(scot %da now))
       ==
     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)
   =.  wef  ~
   abet:kiln
 ::
@@ -692,11 +680,13 @@
     |=  [kel=weft except=(set desk) force=?]
     ^+  kiln
     =/  ded  (find-blocked kel except)
-    ?:  force
-      =.  kiln  (suspend-many ded)
-      (bump-many kel (all-desks-but (~(uni in except) ded)))
-    ?:  =(~ ded)
-      (bump-many kel (all-desks-but 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)
     =-  (^emit (pyre:pass leaf/- ~))
     "kiln: desks blocked upgrade to {<zuse/zuse>}: {<ded>}"
   ::
@@ -924,11 +914,7 @@
       update-running-dudes
     ?.  =(%base loc)
       kiln
-    =/  kel=[@tas @ud]
-      ?~  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 zuse+zuse (all-desks-but (get-unblockers ark)))
   ::
   ++  take-merge-main
     |=  syn=sign-arvo
@@ -1043,6 +1029,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