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

Merge pull request #807 from thaJeztah/golint-fixes 

golint: remove redundant ifs
This commit is contained in:
Vincent Demeester 2018-01-13 14:55:14 +01:00 committed by GitHub
parent b7b3e9a261 d845b4d36a
commit 1694921047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/command/trust/sign.go
View File

@ -243,8 +243,5 @@ func addStagedSigner(notaryRepo client.Repository, newSigner data.RoleName, sign
if err := notaryRepo.AddDelegationRoleAndKeys(trust.ReleasesRole, signerKeys); err != nil { if err := notaryRepo.AddDelegationRoleAndKeys(trust.ReleasesRole, signerKeys); err != nil {
return err return err
} }
if err := notaryRepo.AddDelegationPaths(trust.ReleasesRole, []string{""}); err != nil { return notaryRepo.AddDelegationPaths(trust.ReleasesRole, []string{""})
return err
}
return nil
} }

5
cli/command/trust/signer_remove.go
View File

@ -131,8 +131,5 @@ func removeSingleSigner(cli command.Cli, repoName, signerName string, forceYes b
if err = notaryRepo.RemoveDelegationRole(signerDelegation); err != nil { if err = notaryRepo.RemoveDelegationRole(signerDelegation); err != nil {
return err return err
} }
if err = notaryRepo.Publish(); err != nil { return notaryRepo.Publish()
return err
}
return nil
} }

7
cmd/docker/docker.go
View File

@ -249,12 +249,7 @@ func isSupported(cmd *cobra.Command, details versionDetails) error {
if err := areSubcommandsSupported(cmd, details); err != nil { if err := areSubcommandsSupported(cmd, details); err != nil {
return err return err
} }
return areFlagsSupported(cmd, details)
if err := areFlagsSupported(cmd, details); err != nil {
return err
}
return nil
} }
func areFlagsSupported(cmd *cobra.Command, details versionDetails) error { func areFlagsSupported(cmd *cobra.Command, details versionDetails) error {

5
docs/yaml/yaml.go
View File

@ -79,10 +79,7 @@ func GenYamlTreeCustom(cmd *cobra.Command, dir string, filePrepender func(string
if _, err := io.WriteString(f, filePrepender(filename)); err != nil { if _, err := io.WriteString(f, filePrepender(filename)); err != nil {
return err return err
} }
if err := GenYamlCustom(cmd, f); err != nil { return GenYamlCustom(cmd, f)
return err
}
return nil
} }
// GenYamlCustom creates custom yaml output // GenYamlCustom creates custom yaml output