Skip to content

Commit

Permalink
Merge pull request #16651 from rhatdan/codespell
Browse files Browse the repository at this point in the history
Run codespell on code
  • Loading branch information
openshift-merge-robot authored Nov 28, 2022
2 parents ee8b6ec + f17479c commit c49de22
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/actions/check_cirrus_cron/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This script attempts to confirm functional github action scripts.
# It expects to be called from Cirrus-CI, in a special execution
# enironment. Any use outside this environment will probably fail.
# environment. Any use outside this environment will probably fail.

set -eo pipefail

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ test/version/version: version/version.go

.PHONY: codespell
codespell:
codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether -w
codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w

.PHONY: validate
validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit pr-removes-fixed-skips
Expand Down
6 changes: 3 additions & 3 deletions cmd/quadlet/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ func isImageID(imageName string) bool {
}

// However, podman also accepts image ids as pure hex strings,
// but only those of length 64 are unambigous image ids
// but only those of length 64 are unambiguous image ids
if len(imageName) != 64 {
return false
}
Expand All @@ -246,7 +246,7 @@ func isImageID(imageName string) bool {
}

func isUnambiguousName(imageName string) bool {
// Fully specified image ids are unambigous
// Fully specified image ids are unambiguous
if isImageID(imageName) {
return true
}
Expand All @@ -269,7 +269,7 @@ func isUnambiguousName(imageName string) bool {
return false
}

// warns if input is an ambigious name, i.e. a partial image id or a short
// warns if input is an ambiguous name, i.e. a partial image id or a short
// name (i.e. is missing a registry)
//
// Examples:
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/handlers/compat/images_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) {
// Docker's newer clients popuates `cacheFrom` and `cacheTo` parameter
// by default as empty array for all commands but buildah's design of
// distributed cache expects this to be a repo not image hence parse
// only the first populated repo and igore if empty array.
// only the first populated repo and ignore if empty array.
// Read more here: https://github.com/containers/podman/issues/15928
// TODO: Remove this when buildah's API is extended.
compatIgnoreForcedCacheOptions := func(queryStr string) string {
Expand Down
2 changes: 1 addition & 1 deletion pkg/machine/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ func ConfDirPrefix() (string, error) {
// will not delete certain catastrophic paths.
func GuardedRemoveAll(path string) error {
if path == "" || path == "/" {
return fmt.Errorf("refusing to recusively delete `%s`", path)
return fmt.Errorf("refusing to recursively delete `%s`", path)
}
return os.RemoveAll(path)
}
Expand Down
2 changes: 1 addition & 1 deletion test/system/001-basic.bats
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ See 'podman version --help'" "podman version --remote"
}

# Tests --noout for commands that do not enter the engine
@test "podman --noout properly supresses output" {
@test "podman --noout properly suppresses output" {
run_podman --noout system connection ls
is "$output" "" "output should be empty"
}
Expand Down

0 comments on commit c49de22

Please sign in to comment.