summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoropenshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com>2021-08-03 18:44:01 +0000
committerGitHub <noreply@github.com>2021-08-03 18:44:01 +0000
commitbbdc1c87cb9cf8393b67b4e4cc40cd5005dc2fbd (patch)
tree2edcd4d857aa4573ff9e0d1a5538c860f8373cbc
parent7d53d88e8c2bca462673966cc9b565feeecf99f4 (diff)
parentcc43b5133474af33ccac24d3eb916d789e2bd714 (diff)
downloadpodman-bbdc1c87cb9cf8393b67b4e4cc40cd5005dc2fbd.tar.gz
podman-bbdc1c87cb9cf8393b67b4e4cc40cd5005dc2fbd.tar.bz2
podman-bbdc1c87cb9cf8393b67b4e4cc40cd5005dc2fbd.zip
Merge pull request #11117 from vrothberg/scp-typo
image scp: fix typo in output
-rw-r--r--cmd/podman/images/scp.go4
-rw-r--r--docs/source/markdown/podman-image-scp.1.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go
index 71399e0b7..a47d01995 100644
--- a/cmd/podman/images/scp.go
+++ b/cmd/podman/images/scp.go
@@ -111,7 +111,7 @@ func scp(cmd *cobra.Command, args []string) (finalErr error) {
if err != nil {
return err
}
- fmt.Println("Loaded images(s): " + strings.Join(report.Names, ","))
+ fmt.Println("Loaded image(s): " + strings.Join(report.Names, ","))
case scpOpts.ToRemote: // remote host load
scpOpts.Save.Format = "oci-archive"
abiErr := abiEng.Save(context.Background(), scpOpts.SourceImageName, []string{}, scpOpts.Save) // save the image locally before loading it on remote, local, or ssh
@@ -137,7 +137,7 @@ func scp(cmd *cobra.Command, args []string) (finalErr error) {
if err != nil {
return err
}
- fmt.Println("Loaded images(s): " + strings.Join(rep.Names, ","))
+ fmt.Println("Loaded image(s): " + strings.Join(rep.Names, ","))
}
return nil
}
diff --git a/docs/source/markdown/podman-image-scp.1.md b/docs/source/markdown/podman-image-scp.1.md
index 7d143c851..420452a4d 100644
--- a/docs/source/markdown/podman-image-scp.1.md
+++ b/docs/source/markdown/podman-image-scp.1.md
@@ -59,7 +59,7 @@ Copying blob 9450ef9feb15 [--------------------------------------] 0.0b / 0.0b
Copying config 1f97f0559c done
Writing manifest to image destination
Storing signatures
-Loaded images(s): docker.io/library/alpine:latest
+Loaded image(s): docker.io/library/alpine:latest
```
## SEE ALSO