aboutsummaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-11 11:30:05 -0400
committerGitHub <noreply@github.com>2020-09-11 11:30:05 -0400
commitd7db1da7897160e1e90accbf0a178a4da99638a4 (patch)
tree38cf5056056bf5b87b61125c55fc2e6b6f2ceabe /libpod
parent881f2dfe9221a65b0bcac8682dc3add12bfa6077 (diff)
parent526f01cdf59b966b6ec0d35f10cdd95ad1aa2611 (diff)
downloadpodman-d7db1da7897160e1e90accbf0a178a4da99638a4.tar.gz
podman-d7db1da7897160e1e90accbf0a178a4da99638a4.tar.bz2
podman-d7db1da7897160e1e90accbf0a178a4da99638a4.zip
Merge pull request #7600 from rhatdan/codespell
Fix up errors found by codespell
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_exec.go2
-rw-r--r--libpod/container_internal.go2
-rw-r--r--libpod/define/errors.go4
-rw-r--r--libpod/define/pod_inspect.go2
-rw-r--r--libpod/info.go2
-rw-r--r--libpod/options.go2
6 files changed, 7 insertions, 7 deletions
diff --git a/libpod/container_exec.go b/libpod/container_exec.go
index 2a852ab81..f5f54c7cc 100644
--- a/libpod/container_exec.go
+++ b/libpod/container_exec.go
@@ -629,7 +629,7 @@ func (c *Container) ExecRemove(sessionID string, force bool) error {
logrus.Infof("Removing container %s exec session %s", c.ID(), session.ID())
- // Update status of exec session if running, so we cna check if it
+ // Update status of exec session if running, so we can check if it
// stopped in the meantime.
if session.State == define.ExecStateRunning {
running, err := c.ociRuntime.ExecUpdateStatus(c, session.ID())
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 5a0a0edfa..0514fb46f 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -1269,7 +1269,7 @@ func (c *Container) stop(timeout uint) error {
c.state.StoppedByUser = true
if !conmonAlive {
- // Conmon is dead, so we can't epect an exit code.
+ // Conmon is dead, so we can't expect an exit code.
c.state.ExitCode = -1
c.state.FinishedTime = time.Now()
c.state.State = define.ContainerStateStopped
diff --git a/libpod/define/errors.go b/libpod/define/errors.go
index 7714ebbf0..b3f6483d1 100644
--- a/libpod/define/errors.go
+++ b/libpod/define/errors.go
@@ -163,6 +163,6 @@ var (
ErrNetworkOnPodContainer = errors.New("network cannot be configured when it is shared with a pod")
// ErrStoreNotInitialized indicates that the container storage was never
- // initilized.
- ErrStoreNotInitialized = errors.New("the container storage was never initilized")
+ // initialized.
+ ErrStoreNotInitialized = errors.New("the container storage was never initialized")
)
diff --git a/libpod/define/pod_inspect.go b/libpod/define/pod_inspect.go
index 634cbb728..60e19fe05 100644
--- a/libpod/define/pod_inspect.go
+++ b/libpod/define/pod_inspect.go
@@ -87,7 +87,7 @@ type InspectPodInfraConfig struct {
// HostAdd adds a number of hosts to the infra container's resolv.conf
// which will be shared with the rest of the pod.
HostAdd []string
- // Networks is a list of CNI networks te pod will join.
+ // Networks is a list of CNI networks the pod will join.
Networks []string
}
diff --git a/libpod/info.go b/libpod/info.go
index 050d792bc..153000b6f 100644
--- a/libpod/info.go
+++ b/libpod/info.go
@@ -162,7 +162,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
return nil, errors.Wrapf(err, "error parsing system uptime")
}
- // TODO Isnt there a simple lib for this, something like humantime?
+ // TODO Isn't there a simple lib for this, something like humantime?
hoursFound := false
var timeBuffer bytes.Buffer
var hoursBuffer bytes.Buffer
diff --git a/libpod/options.go b/libpod/options.go
index 61379710d..d592124bc 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -619,7 +619,7 @@ func WithSecLabels(labelOpts []string) CtrCreateOption {
}
}
-// WithUser sets the user identity field in configutation.
+// WithUser sets the user identity field in configuration.
// Valid uses [user | user:group | uid | uid:gid | user:gid | uid:group ].
func WithUser(user string) CtrCreateOption {
return func(ctr *Container) error {