Merge pull request #820 from belisarius222/ford-fix-triangle-builds

fix bug in +move-root-to-cache
This commit is contained in:
Ted Blackman 2018-09-24 14:07:11 -07:00 committed by GitHub
commit 12e0c2f5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1561,6 +1561,11 @@
|= =build-status
%_ build-status
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])
::
=- (~(del by -) [%duct duct])
@ -1725,7 +1730,9 @@
=. builds.state
%+ ~(jab by builds.state) new-sub
|= =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
--
@ -5500,22 +5507,6 @@
:: nothing depends on :build, so we'll remove it
::
:- 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
builds-by-schematic