summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-01-13 17:59:58 +0100
committerGitHub <noreply@github.com>2020-01-13 17:59:58 +0100
commite83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc (patch)
tree190410369b4bcbd12891fcfc1ecbe5bb21ea4050 /cmd
parent9e2e4d7615311b38b1e553af32a5666888ef3c96 (diff)
parent4093b2c0111369f9590d803c53a40b79ae2fd1dd (diff)
downloadpodman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.tar.gz
podman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.tar.bz2
podman-e83a1b87da0c2b88ebd69828a79d4b9ecf11b0dc.zip
Merge pull request #4817 from rhatdan/codespell
Add codespell to validate spelling mistakes in code.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/containers_prune.go4
-rw-r--r--cmd/podman/errors_remote.go4
-rw-r--r--cmd/podman/images_prune.go4
-rw-r--r--cmd/podman/reset.go4
-rw-r--r--cmd/podman/shared/intermediate.go2
-rw-r--r--cmd/podman/shared/intermediate_novarlink.go2
-rw-r--r--cmd/podman/system_prune.go4
-rw-r--r--cmd/podman/varlink/io.podman.varlink2
-rw-r--r--cmd/podman/volume_prune.go4
9 files changed, 15 insertions, 15 deletions
diff --git a/cmd/podman/containers_prune.go b/cmd/podman/containers_prune.go
index 78c50268c..6a86c24fd 100644
--- a/cmd/podman/containers_prune.go
+++ b/cmd/podman/containers_prune.go
@@ -49,11 +49,11 @@ func pruneContainersCmd(c *cliconfig.PruneContainersValues) error {
reader := bufio.NewReader(os.Stdin)
fmt.Printf(`WARNING! This will remove all stopped containers.
Are you sure you want to continue? [y/N] `)
- ans, err := reader.ReadString('\n')
+ answer, err := reader.ReadString('\n')
if err != nil {
return errors.Wrapf(err, "error reading input")
}
- if strings.ToLower(ans)[0] != 'y' {
+ if strings.ToLower(answer)[0] != 'y' {
return nil
}
}
diff --git a/cmd/podman/errors_remote.go b/cmd/podman/errors_remote.go
index 19df2d2d8..378f9398f 100644
--- a/cmd/podman/errors_remote.go
+++ b/cmd/podman/errors_remote.go
@@ -25,7 +25,7 @@ func outputError(err error) {
}
var ne error
switch e := err.(type) {
- // For some reason golang wont let me list them with commas so listing them all.
+ // For some reason golang won't let me list them with commas so listing them all.
case *iopodman.ImageNotFound:
ne = errors.New(e.Reason)
case *iopodman.ContainerNotFound:
@@ -48,7 +48,7 @@ func outputError(err error) {
func setExitCode(err error) int {
cause := errors.Cause(err)
switch e := cause.(type) {
- // For some reason golang wont let me list them with commas so listing them all.
+ // For some reason golang won't let me list them with commas so listing them all.
case *iopodman.ContainerNotFound:
return 1
case *iopodman.InvalidState:
diff --git a/cmd/podman/images_prune.go b/cmd/podman/images_prune.go
index 2b498f83d..8f187cbd7 100644
--- a/cmd/podman/images_prune.go
+++ b/cmd/podman/images_prune.go
@@ -47,11 +47,11 @@ func pruneImagesCmd(c *cliconfig.PruneImagesValues) error {
fmt.Printf(`
WARNING! This will remove all dangling images.
Are you sure you want to continue? [y/N] `)
- ans, err := reader.ReadString('\n')
+ answer, err := reader.ReadString('\n')
if err != nil {
return errors.Wrapf(err, "error reading input")
}
- if strings.ToLower(ans)[0] != 'y' {
+ if strings.ToLower(answer)[0] != 'y' {
return nil
}
}
diff --git a/cmd/podman/reset.go b/cmd/podman/reset.go
index 9d16dc978..203399047 100644
--- a/cmd/podman/reset.go
+++ b/cmd/podman/reset.go
@@ -52,11 +52,11 @@ WARNING! This will remove:
- all images
- all build cache
Are you sure you want to continue? [y/N] `)
- ans, err := reader.ReadString('\n')
+ answer, err := reader.ReadString('\n')
if err != nil {
return errors.Wrapf(err, "error reading input")
}
- if strings.ToLower(ans)[0] != 'y' {
+ if strings.ToLower(answer)[0] != 'y' {
return nil
}
}
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go
index bc12bd2a5..e985e4dc0 100644
--- a/cmd/podman/shared/intermediate.go
+++ b/cmd/podman/shared/intermediate.go
@@ -8,7 +8,7 @@ import (
/*
attention
-in this file you will see alot of struct duplication. this was done because people wanted a strongly typed
+in this file you will see a lot of struct duplication. this was done because people wanted a strongly typed
varlink mechanism. this resulted in us creating this intermediate layer that allows us to take the input
from the cli and make an intermediate layer which can be transferred as strongly typed structures over a varlink
interface.
diff --git a/cmd/podman/shared/intermediate_novarlink.go b/cmd/podman/shared/intermediate_novarlink.go
index 26738ce48..c6f011fe0 100644
--- a/cmd/podman/shared/intermediate_novarlink.go
+++ b/cmd/podman/shared/intermediate_novarlink.go
@@ -6,7 +6,7 @@ package shared
/*
attention
-in this file you will see alot of struct duplication. this was done because people wanted a strongly typed
+in this file you will see a lot of struct duplication. this was done because people wanted a strongly typed
varlink mechanism. this resulted in us creating this intermediate layer that allows us to take the input
from the cli and make an intermediate layer which can be transferred as strongly typed structures over a varlink
interface.
diff --git a/cmd/podman/system_prune.go b/cmd/podman/system_prune.go
index 74fdcde99..bbca7b881 100644
--- a/cmd/podman/system_prune.go
+++ b/cmd/podman/system_prune.go
@@ -63,11 +63,11 @@ WARNING! This will remove:
- all dangling images
- all build cache
Are you sure you want to continue? [y/N] `, volumeString)
- ans, err := reader.ReadString('\n')
+ answer, err := reader.ReadString('\n')
if err != nil {
return errors.Wrapf(err, "error reading input")
}
- if strings.ToLower(ans)[0] != 'y' {
+ if strings.ToLower(answer)[0] != 'y' {
return nil
}
}
diff --git a/cmd/podman/varlink/io.podman.varlink b/cmd/podman/varlink/io.podman.varlink
index ac400a467..b993457ca 100644
--- a/cmd/podman/varlink/io.podman.varlink
+++ b/cmd/podman/varlink/io.podman.varlink
@@ -885,7 +885,7 @@ method UntagImage(name: string, tag: string) -> (image: string)
method RemoveImage(name: string, force: bool) -> (image: string)
# RemoveImageWithResponse takes the name or ID of an image as well as a boolean that determines if containers using that image
-# should be deleted. If the image cannot be found, an [ImageNotFound](#ImageNotFound) error will be returned. The reponse is
+# should be deleted. If the image cannot be found, an [ImageNotFound](#ImageNotFound) error will be returned. The response is
# in the form of a RemoveImageResponse .
method RemoveImageWithResponse(name: string, force: bool) -> (response: RemoveImageResponse)
diff --git a/cmd/podman/volume_prune.go b/cmd/podman/volume_prune.go
index daea5a4d2..48ed68509 100644
--- a/cmd/podman/volume_prune.go
+++ b/cmd/podman/volume_prune.go
@@ -74,11 +74,11 @@ func volumePruneCmd(c *cliconfig.VolumePruneValues) error {
reader := bufio.NewReader(os.Stdin)
fmt.Println("WARNING! This will remove all volumes not used by at least one container.")
fmt.Print("Are you sure you want to continue? [y/N] ")
- ans, err := reader.ReadString('\n')
+ answer, err := reader.ReadString('\n')
if err != nil {
return errors.Wrapf(err, "error reading input")
}
- if strings.ToLower(ans)[0] != 'y' {
+ if strings.ToLower(answer)[0] != 'y' {
return nil
}
}