mirror of
https://github.com/urbit/shrub.git
synced 2024-12-15 12:43:31 +03:00
Merge pull request #820 from belisarius222/ford-fix-triangle-builds
fix bug in +move-root-to-cache
This commit is contained in:
commit
12e0c2f5c8
@ -1561,6 +1561,11 @@
|
|||||||
|= =build-status
|
|= =build-status
|
||||||
%_ build-status
|
%_ build-status
|
||||||
clients
|
clients
|
||||||
|
:: if we've already encountered :i.subs, don't overwrite
|
||||||
|
::
|
||||||
|
?: (~(has by clients.build-status) [%cache new-id])
|
||||||
|
clients.build-status
|
||||||
|
::
|
||||||
=/ old-clients-on-duct (~(get ju clients.build-status) [%duct duct])
|
=/ old-clients-on-duct (~(get ju clients.build-status) [%duct duct])
|
||||||
::
|
::
|
||||||
=- (~(del by -) [%duct duct])
|
=- (~(del by -) [%duct duct])
|
||||||
@ -1725,7 +1730,9 @@
|
|||||||
=. builds.state
|
=. builds.state
|
||||||
%+ ~(jab by builds.state) new-sub
|
%+ ~(jab by builds.state) new-sub
|
||||||
|= =build-status
|
|= =build-status
|
||||||
build-status(clients (~(put ju clients.build-status) [%duct duct] new-client))
|
%_ build-status
|
||||||
|
clients (~(put ju clients.build-status) [%duct duct] new-client)
|
||||||
|
==
|
||||||
::
|
::
|
||||||
state
|
state
|
||||||
--
|
--
|
||||||
@ -5500,22 +5507,6 @@
|
|||||||
:: nothing depends on :build, so we'll remove it
|
:: nothing depends on :build, so we'll remove it
|
||||||
::
|
::
|
||||||
:- removed=&
|
:- removed=&
|
||||||
^+ state
|
|
||||||
::
|
|
||||||
=/ subs=(list ^build) ~(tap in ~(key by subs.build-status))
|
|
||||||
:: for each sub, remove :build from its :clients
|
|
||||||
::
|
|
||||||
=. builds.state
|
|
||||||
|- ^+ builds.state
|
|
||||||
?~ subs builds.state
|
|
||||||
::
|
|
||||||
=? builds.state (~(has by builds.state) i.subs)
|
|
||||||
::
|
|
||||||
%+ ~(jab by builds.state) i.subs
|
|
||||||
|= build-status=^build-status
|
|
||||||
build-status(clients (~(del ju clients.build-status) [%duct duct] build))
|
|
||||||
::
|
|
||||||
$(subs t.subs)
|
|
||||||
::
|
::
|
||||||
%_ state
|
%_ state
|
||||||
builds-by-schematic
|
builds-by-schematic
|
||||||
|
Loading…
Reference in New Issue
Block a user