Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/gc/api_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ func (cs *controllerState) Orders() []orders.Order {
// EnableOrder creates or updates an override with enabled=true.
func (cs *controllerState) EnableOrder(name, rig string) error {
enabled := true
return cs.editor.SetOrderOverride(config.OrderOverride{
return cs.editor.MergeOrderOverride(config.OrderOverride{
Name: name,
Rig: rig,
Enabled: &enabled,
Expand All @@ -458,7 +458,7 @@ func (cs *controllerState) EnableOrder(name, rig string) error {
// DisableOrder creates or updates an override with enabled=false.
func (cs *controllerState) DisableOrder(name, rig string) error {
enabled := false
return cs.editor.SetOrderOverride(config.OrderOverride{
return cs.editor.MergeOrderOverride(config.OrderOverride{
Name: name,
Rig: rig,
Enabled: &enabled,
Expand Down
2 changes: 1 addition & 1 deletion cmd/gc/api_state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ func TestControllerStateOrdersIncludeVisibleCityRoot(t *testing.T) {
if err := os.WriteFile(filepath.Join(autoDir, "order.toml"), []byte(`
[order]
formula = "mol-digest"
gate = "cooldown"
trigger = "cooldown"
interval = "24h"
`), 0o644); err != nil {
t.Fatal(err)
Expand Down
17 changes: 0 additions & 17 deletions cmd/gc/cmd_agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,23 +135,6 @@ func strictFatalLoadConfigWarnings(warnings []string) []string {
return fatal
}

func emitNonFatalLoadConfigWarnings(w io.Writer, prov *config.Provenance) {
if w == nil || prov == nil || len(prov.Warnings) == 0 {
return
}
seen := make(map[string]struct{}, len(prov.Warnings))
for _, warning := range prov.Warnings {
if !isNonFatalLoadConfigWarning(warning) {
continue
}
if _, dup := seen[warning]; dup {
continue
}
seen[warning] = struct{}{}
fmt.Fprintln(w, warning) //nolint:errcheck // best-effort warning emission
}
}

// loadCityConfigForEditFS loads the raw city config WITHOUT pack/include
// expansion. Use for commands that modify city.toml and write it back —
// preserves include directives, pack references, and patches.
Expand Down
Loading
Loading