From 822e2478a0b740e6a44a799335b028f6b5480ee8 Mon Sep 17 00:00:00 2001 From: Logan Allen Date: Mon, 3 Jun 2019 15:23:29 -0700 Subject: [PATCH 1/2] joe's fix for issue #1287 in gall --- sys/vane/gall.hoon | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/vane/gall.hoon b/sys/vane/gall.hoon index 9aa5e89111..b036feb57a 100644 --- a/sys/vane/gall.hoon +++ b/sys/vane/gall.hoon @@ -733,8 +733,13 @@ ++ ap-fill :: add to queue ^- {? _.} =+ suy=(fall (~(get by qel.ged) ost) 0) - =/ subscriber-ship p:(~(got by sup.ged) ost) - ?: &(=(20 suy) !=(our subscriber-ship)) + =/ subscriber=(unit (pair ship path)) + (~(get by sup.ged) ost) + ?: ?& =(20 suy) + ?| ?=(~ subscriber) + !=(our p.u.subscriber) + == + == ~& [%gall-pulling-20 ost (~(get by sup.ged) ost) (~(get by r.zam) ost)] [%| ..ap-fill] :: ~& :* %gall-pushing-20 From 136bb8932f694cfaf5932eb795a3a531a0545661 Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Tue, 4 Jun 2019 20:02:35 +0800 Subject: [PATCH 2/2] Fix indentation. --- sys/vane/gall.hoon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vane/gall.hoon b/sys/vane/gall.hoon index b036feb57a..118c513d4a 100644 --- a/sys/vane/gall.hoon +++ b/sys/vane/gall.hoon @@ -734,7 +734,7 @@ ^- {? _.} =+ suy=(fall (~(get by qel.ged) ost) 0) =/ subscriber=(unit (pair ship path)) - (~(get by sup.ged) ost) + (~(get by sup.ged) ost) ?: ?& =(20 suy) ?| ?=(~ subscriber) !=(our p.u.subscriber)