From 23d1175a2b87d57c2ed61ace72096d76e3c73a42 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Sat, 4 Apr 2015 03:54:25 -0700 Subject: [PATCH] Fix previous commit. Disable ++pray. --- arvo/hoon.hoon | 10 ++++++---- main/app/dojo/core.hook | 2 +- main/app/talk/core.hook | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index c636bd424..44a9aa890 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -8185,10 +8185,12 @@ ?: (~(has in was) u.rev) ~|(%pray-loop !!) =+ ruv=`path`(weld u.rev `path`[%hoon ~]) - =+ txt=(,@ta .^(%cx ruv)) - ~| ruv - %+ rash txt - (ifix [gay gay] tall(was (~(put in was) u.rev), wer u.rev, bug |)) + ~& [%pray-disabled ruv] + !! + :: =+ txt=(,@ta .^(%cx ruv)) + :: ~| ruv + :: %+ rash txt + :: (ifix [gay gay] tall(was (~(put in was) u.rev), wer u.rev, bug |)) :: ++ prey |= gun=(list twig) ^- (unit twig) diff --git a/main/app/dojo/core.hook b/main/app/dojo/core.hook index 58c739453..f4526c10a 100644 --- a/main/app/dojo/core.hook +++ b/main/app/dojo/core.hook @@ -491,7 +491,7 @@ =< he-pone %- dy-rush(pro `(slap (slot 7 vax) [%cnzy %q])) =+ pom=(sole-prompt +<.q.vax) - [%pro pom(cad ':' ' ' cad.pom)] + [%pro pom(cad [':' ' ' cad.pom])] == :: ++ dy-make :: build step diff --git a/main/app/talk/core.hook b/main/app/talk/core.hook index ab5ccc1bc..7c3f34cee 100644 --- a/main/app/talk/core.hook +++ b/main/app/talk/core.hook @@ -279,7 +279,6 @@ %- sh-pare %- ~(gas in *(set partner)) (turn (~(tap by aud)) |=([a=partner *] a)) - ~& [%sh-pass passive.she aud sap] ?: =(sap passive.she) +>.$ sh-prod(passive.she sap)