urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 13:54:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

docket: fix "do we have this glob yet" check

Browse Source 
We were incorrectly assuming we were comparing against a unit value.

Also makes a ~| more useful.
This commit is contained in:
Fang 2021-09-26 21:55:22 +04:00
parent 131cd82fc8
commit 09c74dbaff
No known key found for this signature in database
GPG Key ID: EB035760C1BBA972
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/garden/app/docket.hoon
View File

@ -213,7 +213,8 @@
=. by-base (~(put by by-base) base.href.docket desk.diff) =. by-base (~(put by by-base) base.href.docket desk.diff)
:: if the glob specification is unchanged, keep it :: if the glob specification is unchanged, keep it
:: ::
?: &(?=(^ pre) =(href.docket.u.pre `href.docket)) ::
?: &(?=(^ pre) =(href.docket.u.pre href.docket))
[~[add-fact:cha] state] [~[add-fact:cha] state]
:: if the glob spec changed, but we already host it, keep it :: if the glob spec changed, but we already host it, keep it
:: (this is the "just locally uploaded" case) :: (this is the "just locally uploaded" case)
@ -250,13 +251,14 @@
?. ?=([%suspend ~ *] chad.charge) ?. ?=([%suspend ~ *] chad.charge)
[%install ~] [%install ~]
[%glob u.glob.chad.charge] [%glob u.glob.chad.charge]
~& %rev
:_(state [add-fact fetch-glob]:cha) :_(state [add-fact fetch-glob]:cha)
== ==
== ==
++ take-charge ++ take-charge
|= [=desk =^wire] |= [=desk =^wire]
^- (quip card _state) ^- (quip card _state)
~| %took-for-nonexistent-charge ~| [%took-for-nonexistent-charge desk]
?> (~(has by charges) desk) ?> (~(has by charges) desk)
=* cha ~(. ch desk) =* cha ~(. ch desk)
?+ wire ~|(%bad-charge-wire !!) ?+ wire ~|(%bad-charge-wire !!)