Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #296 from thaJeztah/fix-error-overwrite 

Fix error variable being overwritten
This commit is contained in:
Aaron Lehmann 2017-07-05 19:26:27 -07:00 committed by GitHub
parent 30933b516b 4d4c789cac
commit e672589ec0
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cli/command/stack/remove.go
View File

@ -97,14 +97,15 @@ func removeServices(
dockerCli command.Cli, dockerCli command.Cli,
services []swarm.Service, services []swarm.Service,
) bool { ) bool {
var err error var hasError bool
for _, service := range services { for _, service := range services {
fmt.Fprintf(dockerCli.Err(), "Removing service %s\n", service.Spec.Name) fmt.Fprintf(dockerCli.Err(), "Removing service %s\n", service.Spec.Name)
if err = dockerCli.Client().ServiceRemove(ctx, service.ID); err != nil { if err := dockerCli.Client().ServiceRemove(ctx, service.ID); err != nil {
hasError = true
fmt.Fprintf(dockerCli.Err(), "Failed to remove service %s: %s", service.ID, err) fmt.Fprintf(dockerCli.Err(), "Failed to remove service %s: %s", service.ID, err)
} }
} }
return err != nil return hasError
} }
func removeNetworks( func removeNetworks(
@ -112,14 +113,15 @@ func removeNetworks(
dockerCli command.Cli, dockerCli command.Cli,
networks []types.NetworkResource, networks []types.NetworkResource,
) bool { ) bool {
var err error var hasError bool
for _, network := range networks { for _, network := range networks {
fmt.Fprintf(dockerCli.Err(), "Removing network %s\n", network.Name) fmt.Fprintf(dockerCli.Err(), "Removing network %s\n", network.Name)
if err = dockerCli.Client().NetworkRemove(ctx, network.ID); err != nil { if err := dockerCli.Client().NetworkRemove(ctx, network.ID); err != nil {
hasError = true
fmt.Fprintf(dockerCli.Err(), "Failed to remove network %s: %s", network.ID, err) fmt.Fprintf(dockerCli.Err(), "Failed to remove network %s: %s", network.ID, err)
} }
} }
return err != nil return hasError
} }
func removeSecrets( func removeSecrets(
@ -127,14 +129,15 @@ func removeSecrets(
dockerCli command.Cli, dockerCli command.Cli,
secrets []swarm.Secret, secrets []swarm.Secret,
) bool { ) bool {
var err error var hasError bool
for _, secret := range secrets { for _, secret := range secrets {
fmt.Fprintf(dockerCli.Err(), "Removing secret %s\n", secret.Spec.Name) fmt.Fprintf(dockerCli.Err(), "Removing secret %s\n", secret.Spec.Name)
if err = dockerCli.Client().SecretRemove(ctx, secret.ID); err != nil { if err := dockerCli.Client().SecretRemove(ctx, secret.ID); err != nil {
hasError = true
fmt.Fprintf(dockerCli.Err(), "Failed to remove secret %s: %s", secret.ID, err) fmt.Fprintf(dockerCli.Err(), "Failed to remove secret %s: %s", secret.ID, err)
} }
} }
return err != nil return hasError
} }
func removeConfigs( func removeConfigs(
@ -142,12 +145,13 @@ func removeConfigs(
dockerCli command.Cli, dockerCli command.Cli,
configs []swarm.Config, configs []swarm.Config,
) bool { ) bool {
var err error var hasError bool
for _, config := range configs { for _, config := range configs {
fmt.Fprintf(dockerCli.Err(), "Removing config %s\n", config.Spec.Name) fmt.Fprintf(dockerCli.Err(), "Removing config %s\n", config.Spec.Name)
if err = dockerCli.Client().ConfigRemove(ctx, config.ID); err != nil { if err := dockerCli.Client().ConfigRemove(ctx, config.ID); err != nil {
hasError = true
fmt.Fprintf(dockerCli.Err(), "Failed to remove config %s: %s", config.ID, err) fmt.Fprintf(dockerCli.Err(), "Failed to remove config %s: %s", config.ID, err)
} }
} }
return err != nil return hasError
} }