From b6d3b1bccbcb28d2fd7261335ed08d2c2e1f4004 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Thu, 9 Apr 2015 23:19:50 -0700 Subject: [PATCH] Fix rancherctl service enable/list --- cmd/control/service.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmd/control/service.go b/cmd/control/service.go index a2130ed7..11c63a3f 100644 --- a/cmd/control/service.go +++ b/cmd/control/service.go @@ -65,7 +65,7 @@ func enable(c *cli.Context) { } for _, service := range c.Args() { - if _, ok := cfg.Services[service]; ok && !util.Contains(cfg.EnabledServices, service) { + if !util.Contains(cfg.EnabledServices, service) { cfg.EnabledServices = append(cfg.EnabledServices, service) changed = true } @@ -92,9 +92,14 @@ func list(c *cli.Context) { for service, _ := range cfg.Services { if _, ok := enabled[service]; ok { - fmt.Printf("%s enabled\n", service) + delete(enabled, service) + fmt.Printf("enabled %s\n", service) } else { - fmt.Printf("%s disabled\n", service) + fmt.Printf("disabled %s\n", service) } } + + for service, _ := range enabled { + fmt.Printf("enabled %s\n", service) + } }