Skip to content

Commit

Permalink
Merge pull request #19973 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 Sep 14, 2023
2 parents 957523e + b1e3e8d commit d275203
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/discussion_lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ concurrency:
group: lock

env:
# Number of days befor a closed issue/PR is be comment-locked.
# Number of days before a closed issue/PR is be comment-locked.
# Note: dessant/lock-threads will only process a max. of
# 50 issues/PRs at a time.
CLOSED_DAYS: 90
# Pre-created issue/PR label to add (preferrably a bright color).
# Pre-created issue/PR label to add (preferably a bright color).
# This is intended to direct a would-be commenter's actions.
LOCKED_LABEL: 'locked - please file new issue/PR'

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,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 passt,bu,hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w
codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"*.fish,RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L passt,bu,hastable,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
2 changes: 1 addition & 1 deletion contrib/cirrus/logformatter
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ table.synopsis { border: none; border-collapse: collapse; margin-left: 2em; marg
/* [It] is where the test happens but we don't need any special highlights */
.ginkgo-it { }
/* Finall summary line at bottom */
/* Final summary line at bottom */
.ginkgo-final-success { background: #393; font-weight: bold; font-size: 150%; }
.ginkgo-final-fail { background: #f00; font-weight: bold; font-size: 150%; }
Expand Down
2 changes: 1 addition & 1 deletion contrib/hello/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# New home

The contents of the hello iamge have been moved to a dedicated repository:
The contents of the hello image have been moved to a dedicated repository:
https://github.com/containers/PodmanHello

# Warning
Expand Down
2 changes: 1 addition & 1 deletion libpod/container_top_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ set_argv (int pos, char *arg)
/*
We use cgo code here so we can fork then exec separately,
this is done so we can mount proc after the fork because the pid namespace is
only active after spawning childs.
only active after spawning children.
*/
void
fork_exec_ps ()
Expand Down
2 changes: 1 addition & 1 deletion libpod/networking_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ func (r *Runtime) GetRootlessNetNs(new bool) (*RootlessNetNS, error) {

// When the netns is not valid but the file exists we have to remove it first,
// https://github.com/containers/common/pull/1381 changed the behavior from
// NewNSWithName()so it will now error whe the file already exists.
// NewNSWithName()so it will now error when the file already exists.
// https://github.com/containers/podman/issues/17903#issuecomment-1494329622
if errors.As(err, &ns.NSPathNotNSErr{}) {
logrus.Infof("rootless netns is no longer valid: %v", err)
Expand Down
2 changes: 1 addition & 1 deletion test/system/260-sdnotify.bats
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ none | false | false | 0
@test "podman pull - EXTEND_TIMEOUT_USEC" {
# Make sure that Podman extends the start timeout via DBUS when running
# inside a systemd unit (i.e., with NOTIFY_SOCKET set). Extending the
# timout works by continuously sending EXTEND_TIMEOUT_USEC; Podman does
# timeout works by continuously sending EXTEND_TIMEOUT_USEC; Podman does
# this at most 10 times, adding up to ~5min.

image_on_local_registry=localhost:${PODMAN_LOGIN_REGISTRY_PORT}/name:tag
Expand Down

0 comments on commit d275203

Please sign in to comment.